Issue #15699: Merge readline fixup from 3.5