Merge r1735801 to the 1.7 branch.
diff --git a/pom.xml b/pom.xml
index 370cd9b..9100681 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,22 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>doclint-java8-disable</id>
+            <activation>
+                <jdk>[1.8,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>-Xdoclint:none</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
     <mailingLists>
         <mailingList>