Merge branch 'erp5-component' into erp5
Freeze ERP5 and slapos
Unfreeze ERP5 and slapos
Merge remote-tracking branch 'origin/master' into erp5-component