Fix modulestore merge conflict with heartbeat.
Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat

Fix modulestore merge conflict with heartbeat.