Merge branch 'man' into 'master'

Test fix to openjdk install failure.

See merge request !3
2 jobs for master in 2 minutes and 56 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #24339
build

00:02:08

 
  Release
passed #24340
release

00:00:47