Refactor watcher

* WatchRebootEvent reacts to reboot events triggered on its own ID, and the Id of any machine that is its parent