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.
vhost-plugin: switch from rewrite back to proxypass

Switch the primary traffic proxy for the vhost frontend plugin.
There are still other RewriteRule's that do the setting of
variables, etc.
Fix formatting
Merge pull request #4932 from danmcp/master

Merged by openshift-bot
Bug 1053485 - Changing GID_MIN in login.defs prevents app creation

This patch was originally submitted by Josep 'Pep' Turro Mauri <pep@redhat.com>
Bug 1075221 - Prevent mcollective and watchman restart after logrotate
Turn off direct addressing
Bug 1075221 - Prevent node-web-proxy being restarted by logrotate
Merge pull request #4938 from danmcp/master

Merged by openshift-bot
Merge pull request #4937 from mfojtik/bugzilla/1075221

Merged by openshift-bot
Merge pull request #4940 from mfojtik/bugzilla/1075221_2

Merged by openshift-bot
vhost-plugin: remove keepalive=On for now
Stop using direct addressing
Merge pull request #4941 from danmcp/master

Merged by openshift-bot
Bug 1075673 - Unable to perform git deploy after binary deployment

After doing a successful binary deployment, the node is unable to
process a git deployment
Merge pull request #4850 from vbatts/408-3-rewrite_to_proxypass

Merged by openshift-bot
Add support for multiple platforms in OpenShift.
Changes span both the broker and the node.

Add a setting named 'NODE_PLATFORMS' to broker.conf.
Add an optional attribute named 'platform' to cartridge manifests.
Add an optional 'Required' attribute for the 'Scaling' key to cartridge manifest.

Broker queries nodes of all platforms when building its cartridge cache.
Broker does not allow group overrides for cartridges of different platforms.
Broker uses the cartridge platform to filter nodes based on the 'kernel' fact.

Node handles the case when a web proxy cartridge is not collocated with a web cartridge.

Modify tests to take new logic into account.
Add tests to cover new code paths.
Bug 1074627 - Improve error handling and make more robust

* Improved error handling
* Added cgroups thawing
* Added man page
* Attempt to kill off processes with several methods
Fix broker extended
Merge pull request #4945 from jwhonce/bug/1074627

Merged by openshift-bot