Issue #14285: Merge runpy exception fix from 3.5