Merge pull request #1555 from ogail/1549

Enhance DisableAzureWebsiteDiagnostic to work on Storage and File together
Add documentation for Get-AzurePublishSettingsFile
Add DisableAzureWebsiteDiagnostic scenario tests
Merge pull request #1558 from ogail/1542

Add documentation for Get-AzurePublishSettingsFile
Merge pull request #1557 from ogail/1548

Fix storage account multiple addition to website diagnostic cmdlet
Merge pull request #1559 from ogail/1536

Add DisableAzureWebsiteDiagnostic scenario tests
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into 1548

Conflicts:
	WindowsAzurePowershell/src/Management.ScenarioTest/WebsitesTests/WebsitesTests.cs