SERVER-14549 Don't send replSetUpdatePosition command unless all slaves have sent their handshake
SERVER-14581 add lockstate to cpuprofiler.cpp
Merge remote-tracking branch 'upstream/master'