Fix scenario test failures
Fixes to websites tests
Merge pull request #1186 from ogail/1160

Fix scenario test failures
Final fixes
Merge branch 'dev' of https://github.com/ogail/azure-sdk-tools into 1042

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