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