SERVER-16389 Clean up behavior of shutdown command waiting for replication
Merge remote-tracking branch 'upstream/master'