More on #883. Update watchdog commands and test for D8.