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