Fixes gh-6925 # Conflicts: # docs/manual/src/docs/asciidoc/_includes/servlet/preface/java-configuration.adoc