Issue #25590: Merge rlcompleter change from 3.4 into 3.5