26ce37a1a6
(cherry picked from commit 76fab26c5c02cef38924d04136407489fd9457d9) Conflicts: hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java (cherry picked from commit 6731bb468dab743e0546e8e0fbbefaf46a1729c2)