Added retry logic
fixing merge conflicts
Merge pull request #961 from markcowl/dev

Adding publish scenario tests
Fix for caching issue #1191
Merge pull request #1192 from markcowl/Caching

Fix worker role caching issue #1191
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