Issue #25663: Merge rlcompleter fix from 3.5