80f7165374
(cherry picked from commit 51088d323359587dca7831f74c9d065c2fccc60d) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java