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