Medium: allow watchdog to be disabled (bnc#865365)

The somewhat annoying syntax of needing to specify -W twice, instead of
passing in a value, is due to the need for backwards compatibility.