Brandon Li db432fe76e HDFS-5563. Merging change r1546233 from trunk 11 gadi atpakaļ
..
main db432fe76e HDFS-5563. Merging change r1546233 from trunk 11 gadi atpakaļ
test db432fe76e HDFS-5563. Merging change r1546233 from trunk 11 gadi atpakaļ