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

rebort! "Revert "Replace Jenkins Env Vars""