Cherry-picks for 1.22.10#12870

sean-mcmanus merged 2 commits intoreleasemicrosoft/vscode-cpptools:releasefrom

seanmcm/1_22_10_releasemicrosoft/vscode-cpptools:seanmcm/1_22_10_releaseCopy head branch name to clipboard