SERVER-14349 problem with lock_mgr_test on windows
Merge remote-tracking branch 'upstream/master'