This fixes #7938.  I also added a watchdog piece that checks for recent startups.