SERVER-7596 Fixed compile error
SERVER-14668 Move all LockState methods into the Locker class

This change doesn't have any functional effect. Just prepares the
LockState class to be removed.
Merge remote-tracking branch 'upstream/master'