Fix missign environment variables.
Merge remote-tracking branch 'azure/round7-python-update' into round7-python-update