Applied several s4sync fixes so it's more robust
Merge pull request #1217 from Zentyal/cperello/s4sync-fixes

Applied several s4sync fixes so it's more robust