Merge proposals dependent on lp:~therp-nl/openobject-addons/7.0-lp985606-duplicate_users_from_ldap

1. 7.0-lp985606-duplicate_users_from_ldap
2. Dependent merge proposals