Fix bug 1039760: Add patch support for env vars
Merge pull request #4314 from liggitt/bug_1039760_patch_env_var_api_stage

Merged by openshift-bot