Why did you change this part? The goal of the previous version was to keep SPARK_JAVA_OPTS only for user programs, so that the daemons can have much smaller settings (e.g. less memory).