0.11.20 rebase cleanup for Windows

Closes https://github.com/JuliaLang/julia/issues/5940