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.
Card origin_node_39 - Have Watchman attempt honor state of gear

* Improve Watchman plugin contract
* Add protection for flapping
* Update tests
updatin MysqlDS to be MySQLDS to fall in line with ExampleDS and PostgreSQLDS data source names
Bug 1025195 - Reset quota to the min extra
Merge pull request #4788 from danmcp/master

Merged by openshift-bot
bump_minor_versions for sprint 41
Merge pull request #4787 from developercorey/fix_mysql_ds

Merged by openshift-bot
Rebalancing tests
Merge pull request #4789 from danmcp/master

Merged by openshift-bot
Fix typo
Merge pull request #4791 from danmcp/master

Merged by openshift-bot
add retry logic for deployment scan check
Fixing up comments
Merge pull request #4793 from danmcp/master

Merged by openshift-bot
Bug 1066945 - Fixing urls
Update Contributor's Guide with more detail.
Merge pull request #4794 from danmcp/master

Merged by openshift-bot
Fix output from decode_connections

Strip off "|$app_uuid|$gear_uuid" from the end of all types of
connections (including TOHTTPS etc), not just from connections without
modifiers.
Recalc tracked storage

Create separate op group for recalculating tracked storage

Skip unecessary usage operations when recalculating

Allow telling the trackusageop the max untracked storage amount
Merge pull request #4796 from nhr/contributors_guide_improvements

Merged by openshift-bot