(cherry picked from commit 03dea65e0b17ca2f9460bb6110f6ab3a321b8bf2) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
(cherry picked from commit 03dea65e0b17ca2f9460bb6110f6ab3a321b8bf2) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java