Conflicts:
	component/slapos/buildout.cfg

Conflicts:
	component/apache-php/buildout.cfg

Master version of component/apache-php/buildout.cfg has been kept, as it
provides same functionality but in more updated way.

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

Both files reverted back to master.

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

Both files reverted back to master.

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

Both files reverted back to master.

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

Both files reverted back to master.

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

Both files reverted back to master.

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

Both files reverted back to master.

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

Both files reverted back to master.

Conflicts:
	software/lamp-template-static/software.cfg

compilation of python is not needed here, we relie on python provided with slapos.

It is dummy import for up-to-date software.cfg, but allows to keep retrocompatibility with old software.cfg using python-2.7 in eggs.
python-2.7 should NOT be used in lamp-based profiles.

Conflicts:

	component/mariadb/buildout.cfg

Conflicts:
	component/mariadb/buildout.cfg