[MERGE] forward port branch saas-6 up to eb4f030
[MERGE] forward port branch saas-6 up to eb4f030

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