Fix deployment regression by @Youssef1313 in #6718 (backport to rel/4.0)#6734

Youssef1313 merged 7 commits intomicrosoft:rel/4.0microsoft/testfx:rel/4.0from

youssef-backport-bot:backport/6718/to/rel/4.0youssef-backport-bot/testfx:backport/6718/to/rel/4.0Copy head branch name to clipboard