remove unnecessary cart-data variable descriptions
Bug 1053782 - Make sure httpd restart succeed for broken httpd
Card origin_node_374 - Port Watchman to Origin

* tests for CachedConfig
Merge pull request #4493 from mfojtik/bugzilla/1053782

Merged by openshift-bot
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
Automatic commit of package [rubygem-openshift-origin-node] release [1.19.10-1].
Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [1.17.3-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.19.3-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.19.7-1].
Automatic commit of package [openshift-origin-cartridge-php] release [1.19.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.19.10-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.19.7-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.19.6-1].
Automatic commit of package [openshift-origin-broker-util] release [1.19.6-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.20.4-1].
Automatic commit of package [openshift-origin-node-util] release [1.18.4-1].
Bug 1033673 - Unable to customize MAVEN_OPTS
Merge pull request #4495 from jwhonce/wip/watchman

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

Merged by openshift-bot