Merge pull request #683 from roadkill001/master

Fix for STORM_JAR_JVM_OPTS which is currently broken when STORM_JAR_JVM_OPTS is not specified