Merge branch 'erp5-component' into erp5
Merge branch 'erp5-component' into erp5
jio: update md5sum of instance.cfg.in
jio: revert "Follow naming convention"

This revert e7083872ad. This change must be applied
only when we will have newer version of slapos.cookbook
Add pyOpenSSL component
Merge branch 'erp5-component' into erp5
Merge branch 'erp5'
Don't reset zope password each time.

By don't creating the inituser file if it has already been done once.
Merge branch 'master' into erp5-component