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