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