Merge for 1.31.3 (again)#14314

sean-mcmanus wants to merge 3 commits intoreleasemicrosoft/vscode-cpptools:releasefrom

mainmicrosoft/vscode-cpptools:mainCopy head branch name to clipboard