Allowed JAVA_HOME to be set from the command line
Merge pull request #1529 from kmile/use_java_home

Allowed JAVA_HOME to be set from the command line