Clean up & unify upgrade scripts

- Remove all unversioned upgrade steps
- Strictly compare versions as strings, fix regexps
- Unify variables across upgrade scripts
Register app dns vhost for secondary haproxy gears

Modify the vhost frontend plugin to create a 2nd base vhost conf file
for the app dns so secondary haproxy gears can handle requests for
$OPENSHIFT_APP_DNS

Bug 1161072
Automatic commit of package [rubygem-openshift-origin-node] release [1.32.2-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.32.2-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.11.2-1].
Automatic commit of package [openshift-origin-broker-util] release [1.31.2-1].
Automatic commit of package [openshift-origin-node-util] release [1.31.2-1].
Merge pull request #5954 from ncdc/bug/1161072-vhost-multi-ha-app-dns

Merged by openshift-bot
BZ1158704 - Broker fails to create HA DNS entry for HA app

* If the ha parameter is passed as part of the application creation api,
* the broker was not adding the pending operation to create the routing
* dns. After adding this patch, the routing DNS record is created if and
* only if the broker.conf is set to manage the external routing DNS.
Merge pull request #5956 from calfonso/bz1158704

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.32.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.32.3-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-vhost] release [0.11.3-1].
Automatic commit of package [openshift-origin-node-util] release [1.31.3-1].
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