See the next diff...

It's really just moving it and making it conditional. If STORM_JAR_JVM_OPTS is undefined no space will be added. AFAICT.