Brandon Li 254e87700f HDFS-5259. Merging change r1529730 from trunk 12 anni fa
..
main 254e87700f HDFS-5259. Merging change r1529730 from trunk 12 anni fa
test 254e87700f HDFS-5259. Merging change r1529730 from trunk 12 anni fa