[IMP] crm: make code of merge opportunities overloadable
Merge branch '8.0' of https://github.com/odoo/odoo into 8.0-linux64