(cherry picked from commit d2b941f94a835f7bdde7714d21a470b505aa582b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt