Revert "Replace Jenkins Env Vars"
Merge pull request #2250 from mozilla/revert-2247-fix-bug-1043526-duplicate-envvars-2

Revert "Replace Jenkins Env Vars"