Merge branch 'erp5-component' into erp5
Merge branch 'erp5-component' into erp5
typo and redundant component
cleanup buildout extensions.
Merge remote-tracking branch 'origin/master' into erp5-component