Added lock to cloud-sync script

Conflicts:
	main/users/ChangeLog
Merge pull request #1011 from Zentyal/cperez/cloud-sync-lock

Added lock to cloud-sync script