Merge erp5-component-z2.13 into erp5-cluster-z2.13

Conflicts:
	stack/erp5/buildout.cfg
Hack to use correct branch