Brandon Li da2d86bd04 HDFS-6050. Merging change r1581055 from trunk 11 gadi atpakaļ
..
main da2d86bd04 HDFS-6050. Merging change r1581055 from trunk 11 gadi atpakaļ
test 8f915e55fd HADOOP-3679. Fixup assert ordering in unit tests to yield meaningful error 11 gadi atpakaļ