Merge -c 1433461 from trunk to branch-2 to fix HDFS-4399. Fix RAT warnings by excluding images sub-dir in docs. Contributed by Thomas Graves.