Bug 949121 - FQDNs are lowercased in Apache logs.
WIP Cartridge Refactor - Use gear combined env when calling hooks

* Layer the active cartridge environment variables over the gear and other cartridge variables.
Remove vendor name from installed V2 cartridge path
Merge pull request #1938 from rmillner/BZ949121

Merged by openshift-bot
Fix haproxy v2 path construction
Merge pull request #1941 from jwhonce/wip/v2_cart_model

Merged by openshift-bot
Automatic commit of package [openshift-origin-broker-util] release [1.7.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.7.2-1].
Automatic commit of package [openshift-origin-cartridge-nodejs-0.6] release [1.7.2-1].
Automatic commit of package [openshift-origin-cartridge-cron-1.4] release [1.7.2-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.7.20-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [0.2.2-1].
Automatic commit of package [openshift-origin-cartridge-haproxy-1.4] release [1.7.2-1].
Automatic commit of package [openshift-origin-msg-common] release [1.5.2-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.5.2-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.2.2-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap-6.0] release [1.7.2-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.2.2-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-client] release [1.6.2-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-1.4] release [1.7.2-1].