- Properly fix JVM_OPTS being applied twice