Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-project-onboarding-imp-demo_data-msa

1. trunk-project-onboarding-imp-demo_data-msa
2. Dependent merge proposals