(cherry picked from commit efc510a570cf880e7df1b69932aa41932658ee51) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
(cherry picked from commit efc510a570cf880e7df1b69932aa41932658ee51) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java