Change-Id: Idde8522e11c77f82b376e0c90a9bf33d163d5cb9 (cherry picked from commit ef3f3f6bb14cf44bef1778f1091d8ed8a4b764a3) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Change-Id: Idde8522e11c77f82b376e0c90a9bf33d163d5cb9 (cherry picked from commit ef3f3f6bb14cf44bef1778f1091d8ed8a4b764a3) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt