Merge remote-tracking branch 'origin/master' into erp5-cluster

Conflicts:
	stack/erp5/instance-tidstorage.cfg.in
Use newer slapos.recipe.template for inline templates
erp5: buildout:extends does not work when given at command line