SPARK_SUBMIT_JAVA_OPTS -> SPARK_SUBMIT_OPTS
A few more naming things (minor)
Don't barf when the properties file does not exist