svn merge -c 1300619 from trunk to branch-0.23 FIXES: HADOOP-8169. javadoc generation fails with java.lang.OutOfMemoryError: Java heap space (tgraves via bobby)