See #31266 for background. We have one that we couldn't fix which is in JarLauncherTests.

Comment From: philwebb

With a small tweak in Framework I have solved the last one. I'll close this a duplicate and fix against #31266