JRE-590 Can't run 32 bit version on Windows

(cherry picked from commit eae4401)
5 files changed