Set the proper company_id on an imported partner
Merge branch '7.0-partner-import-company_id' into 7.0