SERVER-13698: fix connection status test.
Merge remote-tracking branch 'upstream/master'