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

This allow to generate non SSL configuration

Needed for PCI compliancy.

This is mandatory for PCI compliancy.

"It seems" that logrotate does not allow to put those parameters in
logrotate.conf

Conflicts:
	component/mariadb/buildout.cfg
	software/erp5/software.cfg

Conflicts:
	component/git/buildout.cfg
	component/openssl/buildout.cfg
	setup.py

Currently ERP5 develops more.

Conflicts:
	slapos/recipe/erp5/__init__.py

Conflicts:
	component/slapos/buildout.cfg