Merge branch 'man' into 'master'

Test fix to openjdk install failure.

See merge request !3
2 jobs for master in 2 minutes and 1 second
Status Job ID Name Coverage
  Build
passed build #24343

00:01:41

 
  Release
passed release #24344

00:00:19