fix building of installer for 64-bit Windows
update to rebased wk_4.8.5 branch for fixing 64-bit windows build