Updating the Dockerfile for prereqs
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].
Automatic commit of package [openshift-origin-cartridge-mysql] release [1.24.2-1].
Automatic commit of package [openshift-origin-cartridge-mock] release [1.19.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.24.2-1].
Automatic commit of package [openshift-origin-logshifter] release [1.6.2-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.22.5-1].