(cherry picked from commit 843ee8d59d8bacbca0d87ccf0790772e39d16138) (cherry picked from commit 26a23eff828a3f4fcbd4362761c329657603277d) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
(cherry picked from commit 843ee8d59d8bacbca0d87ccf0790772e39d16138) (cherry picked from commit 26a23eff828a3f4fcbd4362761c329657603277d) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java