CB-7410 update the docs to match the actual title
CB-7634 Detect JAVA_HOME properly on Ubuntu
Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu)