JAVA_HOME not set properly if Java is already installed

[itlackey]

The jdk lib folder was not found when running the installer on a machine that already had java installed to a different location than the script expected

[Hahn886]

I'm leaving this open until we run a full test, but I believe I've resolved this issue.