Fix tomcat6 not finding JAVA_HOME, make restarting oscar install easier