Wire in support for system messages.
Oops, missed one.
Support system messages in heartbeater.
Remove redundancy.
Merged bug25675 into default