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