Merge "Add option to pass JAVA_OPTIONS"