Merge remote-tracking branch 'origin/erp5-generic' into deployment_generic_CR1094

Conflicts:
	software/erp5/software.cfg

software/erp5/software.cfg

@@ -75,7 +75,7 @@ mode = 0644
 [template-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = f4d8a1c73a43488ef160d92b7f08db8b
+md5sum = ff93a87778520a3c7ce0d7bda93e25cc
 output = ${buildout:directory}/template-zope.cfg
 mode = 0644
 
@@ -145,7 +145,7 @@ mode = 0644
 [template-snippet-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-zope.cfg
-md5sum = ff93a87778520a3c7ce0d7bda93e25cc
+md5sum = cca86232d644f0050f1f96c270867852
 output = ${buildout:directory}/template-snippet-zope.cfg
 mode = 0644