(cherry picked from commit 33a412e8a4ab729d588a9576fb7eb90239c6e383) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit 55f7ceb0db13a6ef7a29b54f63075ce05dc1b019)
(cherry picked from commit 33a412e8a4ab729d588a9576fb7eb90239c6e383) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit 55f7ceb0db13a6ef7a29b54f63075ce05dc1b019)