Allow to pass external JAVA_OPTS.
Update JAVA_OPTS setting.
Merge pull request #1028 from matejonnet/master

Allow to pass external JAVA_OPTS.