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