Merge proposals dependent on lp://qastaging/~credativ/openobject-addons/7.0-csv-import-domain

1. 7.0-csv-import-domain
2. Dependent merge proposals