Fix ShortTermRetentionTest and add AzureRM mappings

Author: adeal

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -2200,6 +2200,8 @@
     "New-AzSqlDatabaseImport": "New-AzureRmSqlDatabaseImport",
     "Get-AzSqlDatabaseGeoBackupPolicy": "Get-AzureRmSqlDatabaseGeoBackupPolicy",
     "Set-AzSqlDatabaseGeoBackupPolicy": "Set-AzureRmSqlDatabaseGeoBackupPolicy",
+    "Get-AzSqlDatabaseBackupShortTermRetentionPolicy": "Get-AzureRmSqlDatabaseBackupShortTermRetentionPolicy",
+    "Set-AzSqlDatabaseBackupShortTermRetentionPolicy": "Set-AzureRmSqlDatabaseBackupShortTermRetentionPolicy",
     "Get-AzSqlDatabaseBackupLongTermRetentionPolicy": "Get-AzureRmSqlDatabaseBackupLongTermRetentionPolicy",
     "Set-AzSqlDatabaseBackupLongTermRetentionPolicy": "Set-AzureRmSqlDatabaseBackupLongTermRetentionPolicy",
     "Get-AzSqlDatabaseLongTermRetentionBackup": "Get-AzureRmSqlDatabaseLongTermRetentionBackup",

src/Sql/Sql.Test/ScenarioTests/DatabaseBackupTests.ps1

@@ -350,6 +350,7 @@ function Test-RemoveDatabaseRestorePoint
 	{
 		Remove-ResourceGroupForTest $rg
 	}
+}
 
 function Test-ShortTermRetentionPolicy
 {
@@ -412,7 +413,6 @@ function Test-ShortTermRetentionPolicy
 			# We expect an error here
 			Assert-AreEqual $_.Count 1
 		}
-
  	}
 	finally
 	{