Issue #25663: Merge rlcompleter fix from 3.4 into 3.5