Make env variable names consistent
Merge branch 'master' into winazure_deployment