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