[MERGE] Foward-port saas-5 up to ee4df1e3

addons/account/account_analytic_line.py

addons/account/account_invoice.py

addons/crm/base_partner_merge.py

addons/mail/mail_thread.py

addons/mass_mailing/controllers/main.py

addons/mass_mailing/models/mass_mailing.py

addons/web/static/src/js/chrome.js

addons/web/static/src/js/core.js

addons/web/static/src/js/view_form.js

addons/web/static/src/xml/base.xml

addons/website_customer/controllers/main.py

openerp/models.py