Merge branch 'master' into dev

Conflicts:
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.ps1
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestCreateExistingRedisCacheTest.json
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestRedisCache.json
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestRedisCachePipeline.json
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestSetNonExistingRedisCacheTest.json
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config
	src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
	src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs
	src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs
	src/ResourceManager/RedisCache/Commands.RedisCache/Microsoft.Azure.Commands.RedisCache.dll-Help.xml
	src/ResourceManager/RedisCache/Commands.RedisCache/Microsoft.Azure.Commands.RedisCache.format.ps1xml
	src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributes.cs
	src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributesWithAccessKeys.cs
	src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheClient.cs
	src/ResourceManager/RedisCache/Commands.RedisCache/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/BaseAzureServiceDiagnosticsExtension.cs
	src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/GetAzureServiceDiagnosticsExtension.cs
	src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Diagnostics/SetAzureServiceDiagnosticsExtension.cs
	src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml

Author: ogail