Incorporate Burt's changes to avoid a potential bad merge due to difference in filenames.
Incorporate Burt's changes to avoid a potential bad merge due to difference in filenames.

QingChenmsft/azure-cli,yugangw-msft/azure-cli,BurtBiel/azure-cli,QingChenmsft/azure-cli,QingChenmsft/azure-cli,yugangw-msft/azure-cli,BurtBiel/azure-cli,samedder/azure-cli,QingChenmsft/azure-cli,samedder/azure-cli,samedder/azure-cli,yugangw-msft/azure-cli,yugangw-msft/azure-cli,samedder/azure-cli,yugangw-msft/azure-cli,yugangw-msft/azure-cli