Merge pull request #20090 from albers/completion-map-values

Improve key specific bash subcompletions