Merge branch 'man' into 'master'

Test fix to openjdk install failure.

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

00:01:41

 
  Release
passed #24350
release

00:00:29