Issue #16484: Merge pydoc Windows fixes from 3.5