Java fix for when JAVA_OPTIONS is set
Merge pull request #169 from emilb/master

Better java version handing when JAVA_OPTIONS is set