Heartbeats from non-leaders include a field to reflect that fact, so we can tell if/when it works. Also fixed timeout so it should actually timeout.