Apply code review
Merge branch 'master' into 1297

Conflicts:
	WindowsAzurePowershell/src/Management.ScenarioTest/Resources/Websites/WebsitesTests.ps1
	WindowsAzurePowershell/src/Management.ScenarioTest/WebsitesTests/WebsitesTests.cs