Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-website-builder-onboarding-ptr

1. trunk-website-builder-onboarding-ptr
2. Dependent merge proposals