SERVER-14475 Network thread should not exit with error during clean shutdown
Merge remote-tracking branch 'upstream/master'