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