Updates software/erp5/software.cfg to point to working commits

This is prep for a release tag. Also reverts changes to stack/slapos.cfg to avoid merge conflicts.
In stack/erp5/buildout.cfg, all eggs are updated to the latest versions and pinned.

software/erp5/software.cfg

 [buildout]
 extends =
   ../../stack/erp5/buildout.cfg
+
+[erp5]
+revision = 5d873c30d244ca4f47b37a09589468040f7bb2ee
+
+[slapos.cookbook-repository]
+revision = 400ccad4df317bcbee063a95dbcf02c2abfa0278
+

stack/erp5/buildout.cfg

@@ -296,7 +296,7 @@ extra-context =
 [template-erp5]
 < = download-base
 filename = instance-erp5.cfg.in
-md5sum = 535e8089acf808efe1d4e55328404ce3
+md5sum = 4aca7b8633c12ad6a0fe2ac569648c82
 
 [template-zeo]
 < = download-base
@@ -601,18 +601,23 @@ ZODB3 = 3.10.5+SlapOSPatched001
 # specify dev version to be sure that an old released version is not used
 cloudooo = 1.2.5-dev
 
+# use newer version than specified in ZTK
+PasteDeploy = 1.5.2
+Pygments = 2.0.2
+coverage = 3.7.1
+
+# test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
+Products.PluggableAuthService = 1.9.0
+
 # official pysvn egg does not supports --include-dirs and
 # --library-dirs, so we use our modified version
 pysvn = 1.7.4nxd006
 
-# newer version requires zope.traversing>=4.0.0a2.
-zope.app.appsetup = 3.16.0
-
-# newer version requires zope.i18n>=4.0.0a3
-zope.app.publication = 3.14.0
+# we are still using this old stable version.
+rdiff-backup = 1.0.5
 
-# newer version requires zope.testbrowser>=4
-zope.app.testing = 3.8.1
+# use newest version of slapos.cookbook
+slapos.cookbook =
 
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001
@@ -624,6 +629,15 @@ Products.CMFDefault = 2.2.4
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
 
+# newer version requires zope.traversing>=4.0.0a2.
+zope.app.appsetup = 3.16.0
+
+# newer version requires zope.i18n>=4.0.0a3
+zope.app.publication = 3.14.0
+
+# newer version requires zope.testbrowser>=4
+zope.app.testing = 3.8.1
+
 # Pinned versions
 MySQL-python = 1.2.5
 Pillow = 2.8.1
@@ -633,7 +647,6 @@ Products.ExternalEditor = 1.1.0
 Products.GenericSetup = 1.7.5
 Products.LongRequestLogger = 1.1.0
 Products.MimetypesRegistry = 2.0.7
-Products.PluggableAuthService = 1.10.0
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.9
 PyPDF2 = 1.24
@@ -644,14 +657,16 @@ WSGIUtils = 0.7
 apache-libcloud = 0.17.0
 astroid = 1.3.6
 chardet = 2.3.0
+collective.recipe.template = 1.11
 csp-eventlet = 0.7.0
 ecdsa = 0.13
 elementtree = 1.2.6.post20050316
 erp5diff = 0.8.1.7
 eventlet = 0.17.4
+five.formlib = 1.0.4
 five.localsitemanager = 2.0.5
 gitdb = 0.6.4
-greenlet = 0.4.7
+greenlet = 0.4.6
 http-parser = 0.8.3
 httplib2 = 0.9.1
 huBarcode = 1.0.0
@@ -659,7 +674,6 @@ interval = 1.0.0
 ipdb = 0.8.1
 ipython = 3.1.0
 logilab-common = 0.63.2
-neoppod = 1.3
 numpy = 1.9.2
 plone.recipe.command = 1.1
 ply = 3.6
@@ -673,7 +687,6 @@ python-ldap = 2.4.19
 python-magic = 0.4.6
 python-memcached = 1.54
 qrcode = 5.1
-rdiff-backup = 1.0.5
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 slapos.recipe.template = 2.7
@@ -684,10 +697,9 @@ spyne = 2.11.0
 suds = 0.4
 threadframe = 0.2
 timerserver = 2.0.2
-urlnorm = 1.1.3
+urlnorm = 1.1.2
 uuid = 1.30
 validictory = 1.0.0
-xfw = 0.10
 xupdate-processor = 0.4
 
 # Required by:

stack/slapos.cfg

@@ -71,8 +71,7 @@ networkcache-section = networkcache
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = erp5-cluster
-revision = e20fb6ea96c70c472c024220ff272e9b3b53cd70
+branch = master
 git-executable = ${git:location}/bin/git
 
 [slapos-cookbook-develop]