(cherry picked from commit b52fd05d42d9a76f6936a5d86c23fcd66244fe3d) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java
(cherry picked from commit b52fd05d42d9a76f6936a5d86c23fcd66244fe3d) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractContractAppendTest.java