LockManager fixes and cleanup
Merge branch 'master' of github.com:mongodb/mongo
Merge remote-tracking branch 'upstream/master'