[MERGE] forward port of branch saas-4 up to revid bb26dea6

addons/account/account.py

addons/account/edi/invoice.py

...ns/account_analytic_analysis/account_analytic_analysis.py

addons/analytic/analytic.py

addons/auth_oauth/auth_oauth_data.xml

addons/crm/crm_lead.py

addons/crm/wizard/crm_lead_to_opportunity.py

addons/gamification/data/goal_base.xml

addons/gamification/models/challenge.py

addons/gamification/models/goal.py

addons/gamification/security/gamification_security.xml

addons/hr_holidays/hr_holidays.py

addons/hr_holidays/hr_holidays_view.xml

addons/hw_escpos/escpos/supported_devices.py

addons/mail/mail_followers.py

addons/mail/mail_mail.py

addons/mail/mail_thread.py

addons/marketing_campaign/marketing_campaign.py

addons/mass_mailing/views/email_template.xml

addons/point_of_sale/point_of_sale.py