Merge branch '2.0.x' into 2.1.x

Author: joshiste

pom.xml

@@ -64,7 +64,7 @@
         <git-commit-id-plugin.version>2.2.5</git-commit-id-plugin.version>
         <flatten-maven-plugin.version>1.0.1</flatten-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
-        <checkstyle.version>8.14</checkstyle.version>
+        <checkstyle.version>8.18</checkstyle.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     </properties>
     <modules>