Merge proposals dependent on lp:~camptocamp/department-mgmt/add-account-department-fix-default-anyltic-jge

1. add-account-department-fix-default-anyltic-jge
2. Dependent merge proposals