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.
Merge pull request #1938 from rmillner/BZ949121

Merged by openshift-bot
Merge pull request #1941 from jwhonce/wip/v2_cart_model

Merged by openshift-bot