plugins/dns/nsupdate: Fix example of key algorithm

Fix the commented-out example setting for BIND_KEYALGORITHM in the
dns-nsupdate example configuration file.
oo-diagnostics: Fix test_node_mco_log when no log

Make test_node_mco_log fail gracefully when the node mcollective log file
is absent.  Before this commit, the test would hang because it would run
a sed command with no input file provided.

This commit fixes bug 1077664.
rubygem-openshift-origin-common: Req. parseconfig

rubygem-openshift-origin-common.spec: Add a Requires: on the parseconfig
rubygem because oo-diagnostics uses parseconfig.

This commit fixes bug 1083334.
Updating the Dockerfile for prereqs
oo-diagnostics: Drop unneeded require 'socket'

Drop a "require 'socket'" statement in the test_broker_certificate check.

This require statement was obviated in commit
9b72939f28a6d35354db74cc7464d879bbd3a81e.
oo-diagnostics: Better handle curl error

Catch and report if curl returns an error in the test_broker_certificate
check.

Previously, test_broker_certificate would ignore curl's return code, and so
errors connecting to the broker would turn up as backtraces when
test_broker_certificate would try to parse the output from curl.
Remove unused code
v2_cart_model: guarantee user env vars override

Bug 1088005
https://bugzilla.redhat.com/show_bug.cgi?id=1088005

Cart env vars were overriding identically-named user env vars, which is
counter to the intended (and documented) behavior. This change merges
the user env vars (from `.env/user_vars`) after merging the cart env
vars in order to enforce the correct precedence.

Squashed commit: user env should override OPENSHIFT_SECRET_TOKEN

Squashed commit: node: Revise environ.rb env load order, refine tests

Added control script wrapper to test so control env vars can be examined
after the fact

Fixed `Environ#from_gear` to filter user env vars before cart env vars are
loaded

Squashed commit: Added more complete env var override testing
mass bumpspec to fix tags
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.21.2-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-client] release [1.20.2-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.24.2-1].
Automatic commit of package [rubygem-openshift-origin-auth-remote-user] release [1.20.2-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [1.24.2-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.6.2-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.17.2-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.23.2-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.24.2-1].
Automatic commit of package [rubygem-openshift-origin-admin-console] release [1.21.2-1].
Automatic commit of package [openshift-origin-cartridge-jenkins] release [1.21.2-1].