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.
Bug 1070450: Improve message when an application cannot have additional storage
Move rev_proxy_host environment setting higher in the rules
Handle empty plans
Automatic commit of package [rubygem-openshift-origin-node] release [1.21.3-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.14.3-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.21.2-1].
Automatic commit of package [openshift-origin-cartridge-php] release [1.21.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.21.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.21.3-1].
Automatic commit of package [openshift-origin-broker-util] release [1.21.2-1].
Automatic commit of package [openshift-origin-node-util] release [1.20.3-1].
Merge pull request #4876 from danmcp/master

Merged by openshift-bot
Merge pull request #4874 from liggitt/bug_1070450_improve_no_storage_message

Merged by openshift-bot
Bug 1071819: Fix storage dropdown overflow
Merge pull request #4875 from bparees/jenkins_rproxy

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.4.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.21.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.21.3-1].