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