Merge "Fix JAVA_HOME for CentOS7"