Revert "SERVER-15541 Simplify the save/restore lock state code"

This reverts commit 5f4cc63e737af5a4fa19d2f0cf33599c231ef1e4.
Revert "SERVER-15614 LockerImpl changes to support diagnostics and deadlock"

This reverts commit 629243d3ec1e0834754574d0dffb59c43d35e85e.
Merge remote-tracking branch 'upstream/master'