[MERGE] forward port of branch saas-3 up to a35aec2a

...ns/account_analytic_analysis/account_analytic_analysis.py

addons/email_template/email_template.py

addons/event/event.py

addons/event_sale/event_sale.py

addons/hr_holidays/report/holidays_summary_report.py

addons/mail/mail_alias.py

addons/stock/security/ir.model.access.csv

addons/website_partner/models/res_partner.py

openerp/addons/base/ir/ir_model.py

openerp/osv/orm.py

openerp/tools/config.py