Merge GetAzureStoreAvailableAddOn into GetAzureStoreAddOn