node-proxy: Stop on remove, restart in upgrade

Change the openshift-origin-node-proxy package to stop the
openshift-node-web-proxy service that it includes when the package is
removed.

Change openshift-origin-node-proxy to condrestart (restart
if already running) openshift-node-web-proxy when the package is
upgraded.

This commit fixes bug 1060274.
Configure-Order should influence API requires
Merge pull request #4753 from smarterclayton/make_configure_order_define_requires

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.18.5-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.20.5-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.20.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.20.5-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.20.5-1].
Automatic commit of package [openshift-origin-broker-util] release [1.20.4-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent] release [1.30.5-1].
Bug 1064720 - Group overrides lost during scale

Caused the overrides to reset because they weren't being passed to
calculate_ops.
Bug 1064239 and 1064141:
 - Determining what components go on a gear upfront
 - Fetching ssl certs from an alternate haproxy gear, in case the previous one did not return it
Bug 1065133: Add websocket option to haproxy manifest and sanitize uri returned from mod_rewrite.
Merge pull request #4762 from smarterclayton/bug_1064720_group_overrides_lost_in_scale

Merged by openshift-bot
Merge pull request #4761 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #4763 from mrunalp/bugs/1065133

Merged by openshift-bot
Bug 1065045 - Enforce cronjob timeout

* Filter for just redhat cron cartridges
* change timeout signal to -9
Merge pull request #4764 from jwhonce/bug/1065045

Merged by openshift-bot
Bug 1065243: fixing invalid mongo query attribute
Bug 1064580 - Keep gear boosted during create

* Gear fell out of boosting during the calculate_deployments while
  being created