Writing env ERB files in the wrong location.
The upstream-repo is no longer necessary.
Merge pull request #3416 from rmillner/BZ998444

Merged by openshift-bot