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 Name Job ID Coverage
  Build
passed build #22507

00:01:58

 
  Release
passed release #22508

00:00:47