Merge "Fixed run.sh to autodetect JAVA_HOME on Mac OS X"