Merge Conflict

Author: pragrawa

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupItemTestCases.ps1

@@ -80,5 +80,5 @@ function Test-DisableAzureBackupProtection
 	$azureBackUpItem.Type = $DataSourceType
 	$azureBackUpItem.ItemName = $itemName
 	$azureBackUpItem.Name = $POName
-	$jobId1 = Disable-AzureRMBackupProtection -Item $azureBackUpItem -Force
+	$jobId1 = Disable-AzureRmBackupProtection -Item $azureBackUpItem -Force
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupPolicyTests.ps1

@@ -93,8 +93,8 @@ function Test-SetAzureBackupProtectionPolicyTests
 function Test-RemoveAzureBackupProtectionPolicyTests
 {	
 
-	$vault = Get-AzureRMBackupVault -Name $ResourceName;
-	$protectionPolicy = Get-AzureRMBackupProtectionPolicy -vault $vault -Name $PolicyName
+	$vault = Get-AzureRmBackupVault -Name $ResourceName;
+	$protectionPolicy = Get-AzureRmBackupProtectionPolicy -vault $vault -Name $PolicyName
 
 	Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -Force
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupScenarioTests.ps1

@@ -287,7 +287,7 @@ function Test-AzureBackupEndToEnd
 	Try
 	{
 	$startTime = Get-Date -format G;
-	$Job = Disable-AzureRmBackupProtection -RemoveRecoveryPoints -Item $item[0];
+	$Job = Disable-AzureRmBackupProtection -RemoveRecoveryPoints -Item $item[0] -Force;
 	Wait-AzureRmBackupJob -Job $Job;
 	$JobDetails = Get-AzureRmBackupJobDetails -Vault $vault -JobID $Job.InstanceId;
 	Assert-AreEqual $JobDetails.Operation "Unprotect";
@@ -332,7 +332,7 @@ function Test-AzureBackupEndToEnd
 	Try
 	{
 	$startTime = Get-Date -format G;
-	Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionpolicy;
+	Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionpolicy -Force;
 	$endTime = Get-Date -format G;
 	"Remove-AzureRmBackupProtectionPolicy", "Pass", $startTime, $endTime -join "," >> $ResultTxtFile;
 	}