Brandon Li db3ed5df52 HDFS-5407. Merging change r1544362 from trunk 11 anni fa
..
main db3ed5df52 HDFS-5407. Merging change r1544362 from trunk 11 anni fa
test 90d5ecf92e HDFS-5288. Merging change r1544352 from trunk 11 anni fa