Merge branch 'devel-pre-java9-cleanup'

5 jobs for devel in 3 minutes and 47 seconds (queued for 1 second)
latest