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