Brandon Li c86c303a62 HDFS-5171. Merging change r1535586 from trunk 11 gadi atpakaļ
..
main c86c303a62 HDFS-5171. Merging change r1535586 from trunk 11 gadi atpakaļ
test c86c303a62 HDFS-5171. Merging change r1535586 from trunk 11 gadi atpakaļ