SERVER-14412 Fix the read lock assertion logic
Merge remote-tracking branch 'upstream/master'