SERVER-14268: Improve server message parsing
Merge remote-tracking branch 'upstream/master'