SERVER-14668 Fix the lock manager granting logic
SERVER-7596 Native SCRAM-SHA-1 client/shell implementation
SERVER-15209 remove fassert temporarily
Merge remote-tracking branch 'upstream/master'