(cherry picked from commit 6144e0137bb51bd04b46ea5ce42c59c2d4f7657d) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java
(cherry picked from commit 6144e0137bb51bd04b46ea5ce42c59c2d4f7657d) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java