Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  dev-bazel: Fix headlines for java 9 and java 10 support sections

Change-Id: Ia2e338b37a4c579404f757873bd55a386ee476b1

Documentation/dev-bazel.txt

@@ -14,8 +14,13 @@ To build Gerrit from source, you need:
 * zip, unzip
 * gcc
 
-[[Java 10 and newer version support]]
-Java 10 (and newer is) supported through vanilla java toolchain
+[[java]]
+=== Java
+
+[[java-10]]
+==== Java 10 support
+
+Java 10 (and newer) is supported through vanilla java toolchain
 link:https://docs.bazel.build/versions/master/toolchains.html[Bazel option].
 To build Gerrit with Java 10 and newer, specify vanilla java toolchain and
 provide the path to JDK home:
@@ -66,7 +71,9 @@ in `$gerrit_site/etc/gerrit.config` to run Gerrit with Java 10|11|...:
   javaOptions = --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
 ```
 
-[[Java 9 support]]
+[[java-9]]
+==== Java 9 support
+
 Java 9 is supported through alternative java toolchain
 link:https://docs.bazel.build/versions/master/toolchains.html[Bazel option].
 The Java 9 support is backwards compatible. Java 8 is still the default.