(cherry picked from commit 19f373a46b2abb7a575f7884a9c7443b8ed67cd3) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
(cherry picked from commit 19f373a46b2abb7a575f7884a9c7443b8ed67cd3) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java