Better java version handing when JAVA_OPTIONS is set