Clean up & unify upgrade scripts

- Remove all unversioned upgrade steps
- Strictly compare versions as strings, fix regexps
- Unify variables across upgrade scripts
Bug 1163068 - Update oo-watchman man page
Bug 1163910 - Rename watchman log files

* Rename /var/log/openshift/node/cgroup*log files to watchman*.log
Merge pull request #5957 from jwhonce/bug/1163068

Merged by openshift-bot
<docs> Update repos_base in puppet deployment guide

- Update the puppet deployment guide to use the milestone 4 release
  repos in the examples by default.
Merge pull request #5958 from detiber/puppetDeployGuide

<docs> Update repos_base in puppet deployment guide
Merge pull request #5949 from VojtechVitek/upgrade_scrips

Merged by openshift-bot
Add cucumber tests for Unified Push Server cartridge
Merge pull request #5925 from VojtechVitek/unified_push_server_tests

Merged by openshift-bot
bz1132299
throw runtime error if oo-admin-cartridge failed to install a cartridge
Merge pull request #5767 from sztsian/bz1132299

Merged by openshift-bot
BZ#1128857 - Fixes failover of activemq hosts during broker publish

* We were previously reusing a Stomp::Connection which is normally fine
and actually preferred. However, in the failover scenario the connection
that the stomp library has validated goes away, which in certain
failover scenarios causes the first message in the sequence of messages
associated with a routing event to be missing. By reinitializing the
connection when we send a message, the missing message scenario is
avoided.

* Also removing reliable => true in the connection opening as it is implicit.
Merge pull request #5962 from calfonso/bz1128857

Merged by openshift-bot
Option to enable/disable broker stats

Broker - report broker stats as JSON