Conflicts:
	component/apache/buildout.cfg
Avoid using older version of apache from master.

	component/libreoffice-bin/buildout.cfg
Drop changes which problem addressed shall be done by releasing erp5 to master.

	component/stunnel/buildout.cfg
Drop changes which problem addressed shall be done by releasing erp5 to master.

  component/xorg/buildout.cfg
Remove not needed garbage from master.

	slapos/recipe/erp5/__init__.py
Avoid cleanup removal by master.

	slapos/recipe/erp5/template/logrotate_entry.in
Remove not needed garbage from master.

Manually found wrong changes on master:

  component/noVNC/buildout.cfg
Use head instead of pinned version.

  stack/erp5.cfg
Drop changes which problem addressed shall be done by releasing erp5 to master.