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