2c1f33d178
(cherry picked from commit 72f6bd4893dcf10d6dad24753f9be99505a87a1f) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt