SERVER-13645 cleanup heartbeat_info
Merge remote-tracking branch 'upstream/master'