Merged in dlech's heartbeat and disk access LED changes