Fixes for Add-AzureEnvironment
Apply CR
Merge pull request #2031 from ogail/env

Fixes for Add-AzureEnvironment