Conflicts:
	component/automake/buildout.cfg
	component/ca-certificates/buildout.cfg
	component/openssl/buildout.cfg
	software/lamp-template/instance.cfg
	stack/slapos.cfg

(cherry picked from commit 5c54eee5adeb556b8145d6943054c02e9323cefe)

Reason: won't collide with mysql instance in slaprunner

(cherry picked from commit 18f76b5b30513141da32cf879f6cb44678e8b5db)

automake 2.12 will be used by default.
(cherry picked from commit c2ac17fec2df8d176caffc26cccf5a26318fe7a8)

Conflicts:
	software/erp5/software.cfg
	stack/cloudooo.cfg
	stack/erp5/buildout.cfg

Vifbi doesn't see the difference anyway.