(cherry picked from commit 5370a6ffaec5227c0978f10c86a5811155271933) (cherry picked from commit 7db1e57cc160a902a688db7068b6e692d8263a65) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemStorageStatistics.java