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