SPARK-964 Fix for -java-home note. 

I just did a manual testing of this.

with -java-home "jdk", setting just JAVA_HOME and both. Hope it covers all cases.