Merge proposals dependent on lp://staging/~camptocamp/department-mgmt/7.0-port-sale_department

1. 7.0-port-sale_department
2. Dependent merge proposals