Card origin_node_374 - Port Watchman to Origin

* tests for CachedConfig
Bug 1051203
Card origin_node_374 - Port Watchman to Origin

* Added work around for restart in Daemons code.  Work around required
  until we upgrade beyond Deamons 1.1.0
* Added Starting/Stopping/Restarting messages
Merge pull request #4495 from jwhonce/wip/watchman

Merged by openshift-bot
Merge pull request #4496 from danmcp/master

Merged by openshift-bot
Bug 1049064: The helper methods needed to be defined before their use