Fix cartridge dependency dir paths in upgrades
Merge pull request #3941 from ncdc/fix-dependency-dir-upgrades

Merged by openshift-bot
Bug 1015187: Replace curl with httpclient when downloading cartridges
Use .present? to check if the :http_proxy is configured
Bug 1017671 - Minitest is required by parts of activesupport for the console gem

And apparently it doesn't even need to be added to the Gemfile in order to load.
Sorting Requires for the console gem
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.16.1-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.16.1-1].
Automatic commit of package [openshift-origin-cartridge-10gen-mms-agent] release [1.29.1-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.16.1-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.16.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apachedb] release [0.2.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.2.1-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [1.17.1-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.17.1-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [1.16.1-1].
Automatic commit of package [openshift-origin-node-proxy] release [1.16.1-1].
Automatic commit of package [openshift-origin-broker-util] release [1.16.1-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.16.1-1].
Automatic commit of package [rubygem-openshift-origin-frontend-nodejs-websocket] release [0.2.1-1].