Merge branch 'srp' of https://github.com/wastoresh/azure-powershell-pr into dev

Author: EmmaZhu

src/ResourceManager/Storage/Commands.Management.Storage.Test/TestController.cs

@@ -27,8 +27,6 @@ namespace Microsoft.Azure.Commands.Management.Storage.Test.ScenarioTests
 {
     public class TestController
     {
-        bool testViaCsm = true; // Currently set to true, we will get this from Environment varialbe.
-
         private CSMTestEnvironmentFactory csmTestFactory;
         private EnvironmentSetupHelper helper;
 
@@ -163,9 +161,7 @@ private GalleryClient GetGalleryClient()
 
         private StorageManagementClient GetStorageManagementClient()
         {
-            return testViaCsm
-                ? TestBase.GetServiceClient<StorageManagementClient>(this.csmTestFactory)
-                : TestBase.GetServiceClient<StorageManagementClient>(new RDFETestEnvironmentFactory());
+            return TestBase.GetServiceClient<StorageManagementClient>(this.csmTestFactory);
         }
     }
 }