Adding back JVM_OPTS handling