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