fix env / replacement
Merge pull request #2340 from bdecoste/master

Merged by openshift-bot