Updating the Dockerfile for prereqs
Remove newlines from env ERBs
Merge pull request #5336 from ironcladlou/log-erb-newlines

Merged by openshift-bot
Modified URL match rule for remote user auth configurations
Merge pull request #5339 from nhr/rest_api_URL_match

Merged by openshift-bot
Adding test coverage
Merge pull request #5338 from danmcp/master

Merged by openshift-bot
Remove unused code
bump_minor_versions for sprint 44
fix tito rel-eng/packages tracking for msg-common and msg-node-mcollective
bump specs to fix tags
Automatic commit of package [openshift-origin-msg-common] release [1.19.4-1].
fixing tags
fix rel-eng entries to match git tags
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].