Merge master again into ds/custom_editor#10295

DonJayamanne merged 12 commits into

microsoft:ds/custom_editormicrosoft/vscode-python:ds/custom_editorfrom

DonJayamanne:mergeMasterAgainDonJayamanne/pythonVSCode:mergeMasterAgainCopy head branch name to clipboard