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