Automatic merge from submit-queue (batch tested with PRs 38427, 39896, 39889, 39871, 39895)

Fix expected error text

I had initially coded the expected text to match what was coming out of stderr, which was wrong. This makes it match against what comes from stdout.