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