Make watchdogs watchdog.
Merge pull request #387 from jordandukart/7.x-derivatives

Make watchdogs watchdog.