Merge branch 'weekly-2.54'

The core developers might come to a different consensus to address this
problem, but until then I'm incorporating this change to make sure
future releases can be produced.

pom.xml

@@ -354,6 +354,9 @@ THE SOFTWARE.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.10.3</version>
+          <configuration>
+            <additionalparam>-Xdoclint:none</additionalparam>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>