SERVER-15677 Make sure heartbeat reconfig thread is joined before shutting down
Merge remote-tracking branch 'upstream/master'