This brings of-watchdog and the classic watchdog into sync.

Signed-off-by: Alex Ellis <alexellis2@gmail.com>