SERVER-12395 add unique id and check when msync fails
Merge remote-tracking branch 'upstream/master'