WIP Cartridge Refactor - cleanup in cartridges
Merge pull request #2239 from jwhonce/wip/raw_envvar

Merged by openshift-bot