Fix setup_java so $JAVA_HOME can be used.
Merge remote-tracking branch 'upstream/master'
Handle $JAVACMD properly while still respecting $JAVA_HOME
Merge pull request #1189 from machad/master

Fix setup_java so $JAVA_HOME can be used.