Cherry-pick for 1.26.5#13919

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

seanmcm/1_26_5_releasemicrosoft/vscode-cpptools:seanmcm/1_26_5_releaseCopy head branch name to clipboard