Merge "Fix: JAVA_HOME directory detection"