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