Merge branch 'pre-java9-cleanup' into 'master'

Java 9 cleanups compatible with Java 8

See merge request !12
2 jobs for master in 3 minutes and 31 seconds (queued for 3 seconds)