SERVER-16431 Fix compile break with clang
SERVER-16431 Sync::shouldRetry should use DB X lock, not global
Merge remote-tracking branch 'upstream/master'