[MERGE] forward port of branch saas-6 up to 6c6a9f3d

addons/calendar/calendar_data.xml

addons/crm/base_partner_merge.py

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

addons/gamification/models/goal.py

addons/hr_holidays/hr_holidays.py

addons/hr_payroll/report/report_payslip_details.py

addons/point_of_sale/point_of_sale.py

addons/stock/wizard/stock_return_picking.py

addons/stock_account/stock_account.py

doc/cla/corporate/rocksolidsolutions.md

openerp/addons/base/res/res_users.py

openerp/service/server.py