(cherry picked from commit 8d278d8d2e5a8a53308608a8fbc6ba96228e53ef) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit a5c74cd921d0305f3baa23d7dc53064cb3d09968)
(cherry picked from commit 8d278d8d2e5a8a53308608a8fbc6ba96228e53ef) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit a5c74cd921d0305f3baa23d7dc53064cb3d09968)