Merge branch 'man' into 'master'

Test fix to openjdk install failure.

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

00:01:58

 
  Release
passed #22508
release

00:00:47