(cherry picked from commit 34ab50ea92370cc7440a8f7649286b148c2fde65) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java
(cherry picked from commit 34ab50ea92370cc7440a8f7649286b148c2fde65) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java