Brandon Li 1c128966f3 HDFS-5337. Merging change r1530835 from trunk 12 anni fa
..
main 1c128966f3 HDFS-5337. Merging change r1530835 from trunk 12 anni fa
test e79cdd2d9c HDFS-5281. Merging change r1530461 from trunk 12 anni fa