(cherry picked from commit 4014ce5990bff9b0ecb3d38a633d40eaf6cf07a7) (cherry picked from commit 8854cdd9eefd05c10d0518528a3bff6a7348f37e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(cherry picked from commit 4014ce5990bff9b0ecb3d38a633d40eaf6cf07a7) (cherry picked from commit 8854cdd9eefd05c10d0518528a3bff6a7348f37e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt