Merge proposals dependent on lp:~openerp-dev/openobject-addons/saas-4-fix-website-partner-chs

1. saas-4-fix-website-partner-chs
2. Dependent merge proposals