Merge pull request #1168 from htreu/inc_java_opts

Export JAVA_OPTS after setting EXTRA_JAVA_OPTS