Add alias for cmd.watch to cmd.wait
Make `watch` work in mod_watch
Merge pull request #9206 from basepi/waitwatch8612

Add alias for cmd.watch (from cmd.wait) state, Fix #8612