transfered changes from cloud-user-sync-fixes because that branch was made form master
Merge pull request #714 from Zentyal/jag/3.2-cloud-user-sync-fixes

transfered changes from cloud-user-sync-fixes because that branch was ma...