SERVER-14858 Small cleanups to replication startup
Merge remote-tracking branch 'upstream/master'