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
Merge pull request #5247 from derekwaynecarr/update_dockerfile

Merged by openshift-bot
Merge pull request #5341 from danmcp/master

Merged by openshift-bot
Merge pull request #5288 from dobbymoodge/BZ1088005

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.24.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.24.3-1].
Bugs 1084980 and 889947