Merge branch 'man' into 'master'

Test fix to openjdk install failure.

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

00:01:36

 
  Release
passed release #25559

00:00:26