Merge remote-tracking branch 'origin/java'

Conflicts:
	software/erp5/software.cfg
	software/erp5testnode/software.cfg

Both files reverted back to master.

software/java/software.cfg

+[buildout]
+parts =
+  java
+
+versions = versions
+
+[java]
+recipe = slapos.recipe.java