SERVER-16429 Get rid of assertWriteLocked which was doing incomplete check
Merge remote-tracking branch 'upstream/master'