allow custom java_opts to pass to the java vm
Merge branch 'vm_flags'