[MERGE] forward port branch saas-6 up to 7be1a1c5

addons/calendar/calendar.py

addons/event_sale/models/event.py

addons/google_calendar/google_calendar.py

addons/hr_holidays/hr_holidays.py

addons/payment_paypal/controllers/main.py

addons/portal/wizard/portal_wizard.py

addons/product/product.py

addons/website_sale_options/static/src/js/website_sale.js

doc/cla/individual/javierjcf.md

doc/cla/individual/jclopezar.md

doc/cla/individual/rigo1985.md