Resolve test suite discovery import errors due to path ordering#22454

eleanorjboyd merged 4 commits intomicrosoft:mainmicrosoft/vscode-python:mainfrom

shanesaravia:mainshanesaravia/vscode-python:mainCopy head branch name to clipboard