Merge proposals dependent on lp:~sylvain-legal/openupgrade-server/base-res_company-migrate-logo

1. base-res_company-migrate-logo
2. Dependent merge proposals