Merge changes from topic "ES-6.5-discontinued" into stable-2.16 * changes: ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.9 ElasticVersion: Replace unchecked throw w/ javadoc Elasticsearch: Remove support for EOL 6.5 version

diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index b91e86e..df8aa74 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt

@@ -163,7 +163,7 @@
 change, so that reviewers will do it for you. Yes, the way to go is to
 extend gerrit CI to take care of this, but it's not yet implemented.
 
-Gerrit generally follows the
+Gerrit follows the
 link:https://google.github.io/styleguide/javaguide.html[Google Java Style
 Guide].
 
@@ -184,19 +184,6 @@
 wrapper script. If you run your own copy, please use the same version,
 as there may be slight differences between versions.
 
-When considering the style beyond just formatting rules, it is often
-more important to match the style of the nearby code which you are
-modifying than it is to match the style guide exactly. This is
-especially true within the same file.
-
-Additionally, you will notice that most of the newline spacing
-is fairly consistent throughout the code in Gerrit, it helps to
-stick to the blank line conventions.  Here are some specific
-examples:
-
-  * Keep a blank line between all class and method declarations.
-  * Do not add blank lines at the beginning or end of class/methods.
-
 When to use `final` modifier and when not (in new code):
 
 Always: