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

ygol/odoo,dfang/odoo,ygol/odoo,bplancher/odoo,Elico-Corp/odoo_OCB,hip-odoo/odoo,bplancher/odoo,hip-odoo/odoo,laslabs/odoo,Elico-Corp/odoo_OCB,hip-odoo/odoo,ygol/odoo,ygol/odoo,ygol/odoo,laslabs/odoo,Elico-Corp/odoo_OCB,hip-odoo/odoo,hip-odoo/odoo,Elico-Corp/odoo_OCB,storm-computers/odoo,microcom/odoo,bplancher/odoo,laslabs/odoo,laslabs/odoo,microcom/odoo,dfang/odoo,laslabs/odoo,ygol/odoo,ygol/odoo,Elico-Corp/odoo_OCB,bplancher/odoo,microcom/odoo,dfang/odoo,hip-odoo/odoo,storm-computers/odoo,storm-computers/odoo,storm-computers/odoo,dfang/odoo,storm-computers/odoo,microcom/odoo,bplancher/odoo,bplancher/odoo,microcom/odoo,laslabs/odoo,storm-computers/odoo,microcom/odoo,Elico-Corp/odoo_OCB,dfang/odoo,dfang/odoo