Trace2: A few final fixups from upstream/master targeting 2.22.0-RC#139

jeffhostetler merged 4 commits intomicrosoft:vfs-2.21.0microsoft/git:vfs-2.21.0from

jeffhostetler:jh-vfs221-fixupsjeffhostetler/git:jh-vfs221-fixupsCopy head branch name to clipboard