Changes to enable the use of the java.options file