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