Merge (again) for 1.31.3#14299

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

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