release-windows-package: sync with 4.8 branch

Authored by habacker on Sep 30 2019, 10:09 PM.