Merge branch 'FindJNI-ubuntu-paths' into release