Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev
Merge branch 'dev' of https://github.com/markcowl/azure-sdk-tools into dev
remove scenario test settings
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev

Conflicts:
	WindowsAzurePowershell/src/Management.ScenarioTest/Management.ScenarioTest.csproj
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev

Conflicts:
	WindowsAzurePowershell/src/Management.ScenarioTest/Management.ScenarioTest.csproj
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into dev
Merge pull request #1193 from ogail/dev

Fix scenario tests