Brandon Li 225febccc1 HDFS-6451. Merging change r1615702 from trunk 11 lat temu
..
java 225febccc1 HDFS-6451. Merging change r1615702 from trunk 11 lat temu
resources c1e2673754 HDFS-6056. Merging change r1598782 from trunk 11 lat temu