(cherry picked from commit fbd88f1062f3c4b208724d208e3f501eb196dfab) (cherry picked from commit 516bbf1c20547dc513126df0d9f0934bb65c10c7) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java (cherry picked from commit fb1bf424bdad20fff7ab390ce75c4bec558e7e6d)