Fix error in composition of baseline JAVA_OPTS env variable