Unfreeze ERP5 and slapos

stack/erp5/buildout.cfg

@@ -148,8 +148,7 @@ parts =
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = master
-revision = b6456a0a8d949f5083a03f60103dbe41f3aa65
+branch = erp5
 git-executable = ${git:location}/bin/git
 
 [check-recipe]
@@ -347,7 +346,6 @@ repository_id_list = erp5
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
-revision = de65bec43448bd09bc85f40076cc4732d683b7e3
 git-executable = ${git:location}/bin/git
 
 [fix-products-paths]
@@ -702,7 +700,7 @@ requests = 2.2.1
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 six = 1.6.1
-slapos.recipe.build = 0.11.6
+slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2
 slapos.recipe.template = 2.5
 slapos.toolbox = 0.39