Issue #22274: Merge stderr=STDOUT fix from 3.5