Allow service_name to be specified for azure
Merge pull request #19155 from techhat/issue15959

Allow service_name to be specified for azure