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