Merge from master into vnext

Author: MatthewMcGlynn

CanaryValidator/Canary.Tests.ps1

@@ -96,7 +96,7 @@ param (
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateNotNullOrEmpty()]
     [string]$CanaryLogPath = $env:TMP + "\CanaryLogs$((Get-Date).Ticks)",
-	[parameter(HelpMessage="Specifies the file name for canary log file")]
+    [parameter(HelpMessage="Specifies the file name for canary log file")]
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
     [ValidateNotNullOrEmpty()]

TemplateValidator/README.md

@@ -6,7 +6,7 @@ To Validate Storage Capabilities such as Skus available in the CloudCapabilities
 Import-Module ".\AzureRM.TemplateValidator.psm1"
 ```
 # Prerequisites
-Create CloudCapabilities.json by using Get-AzureRMCloudCapabilities tool [AzureStack-Tools repo/CloudCapabilities](../CloudCapabilities). or use the provided sample AzureStackCapabilities_TP2.json in this folder
+Create CloudCapabilities.json by using Get-AzureRMCloudCapabilities tool [AzureStack-Tools repo/CloudCapabilities](../CloudCapabilities). or use the provided sample AzureStackCapabilities_TP3.json in this folder
 For Azure/AzureStack quickstart templates, git clone from below links
 https://github.com/Azure/AzureStack-QuickStart-Templates/
 https://github.com/Azure/Azure-QuickStart-Templates/
@@ -25,4 +25,4 @@ Warning - Changes are required either in Template or the validated cloud to depl
 
 # TroubleShooting
 For "NotSupported" - Refer the region specific capability JSON for the supported capabilities.
-For Warnings(in Console Output) such as "No StorageSkus found in region specific Capabilities JSON file.", Please run Get-AzureRMCloudCapabilities with -IncludeComputeCapabilities and -IncludeStorageCapabilities
+For Warnings(in Console Output) such as "No StorageSkus found in region specific Capabilities JSON file.", Please run Get-AzureRMCloudCapabilities with -IncludeComputeCapabilities and -IncludeStorageCapabilities