SERVER-13961 RIP Client::lockState()
Merge remote-tracking branch 'upstream/master'