Merge remote-tracking branch 'remotes/upstream/dev' into dev

Conflicts:
	WindowsAzurePowershell/src/Management.Store.Test/UnitTests/Cmdlet/GetAzureStoreAvailableAddOnTest.cs
	WindowsAzurePowershell/src/Management.Store/Cmdlet/GetAzureStoreAddOn.cs
	WindowsAzurePowershell/src/Management.Store/Cmdlet/GetAzureStoreAvailableAddOn.cs
	WindowsAzurePowershell/src/Management.Store/Model/StoreClient.cs
	WindowsAzurePowershell/src/Management.Store/Model/WindowsAzureAddOn.cs
	WindowsAzurePowershell/src/Management.Store/Model/WindowsAzureOffer.cs
Merge branch 'dev' of https://github.com/ismetkahraman/azure-sdk-tools into dev