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 1073934 - Check the ERB safe-level for python openshift.conf.erb
Merge pull request #4922 from mfojtik/bugzilla/1073934

Merged by openshift-bot
Adding methods for version comparisons to the cartridge sdk
Adding tests for cartridge sdk version comparisons
Bug 1070719 - Prevent openshift-watchman from running twice
Merge pull request #4917 from brenton/sdk_version_comparison1

Merged by openshift-bot
Blocking rollback once the gear/cart removal is underway
Merge pull request #4926 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #4925 from jwhonce/bug/1070719

Merged by openshift-bot
Bug 1073395: Fixing precedence issue in condition
Speeding up tests
Merge pull request #4928 from danmcp/master

Merged by openshift-bot
Bug 1071105 - On validation just print commit timestamp
Merge pull request #4930 from jwhonce/bug/1071105

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

Merged by openshift-bot
Speeding up tests
Merge pull request #4931 from danmcp/master

Merged by openshift-bot
Fix formatting