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