remove unecessary newline
Update spots where JAVA_HOME is set.