Issue #18010: Merge pydoc web search fix from 3.4 into 3.5