9cf841b1a6
(cherry picked from commit 2f35cc36cdbb5a54afa1545388790496c936b954) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeAttributeProvider.java