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