Brandon Li 95b902fb1e HDFS-5067. Merging change r1522774 from trunk 12 vuotta sitten
..
main 95b902fb1e HDFS-5067. Merging change r1522774 from trunk 12 vuotta sitten
test b3076b00ce HDFS-5085. Merge change r1521601 from trunk. 12 vuotta sitten