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

00:02:08

 
  Release
passed release #24340

00:00:47