(cherry picked from commit 6ae39199dac6ac7be6802b31452552c76da16e24) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java (cherry picked from commit 77b61d1f4e34de9fed3dd6167fa93bb35e85e038) (cherry picked from commit 58df27b87388dbb9729862a58dcdbe0b57e8b1ab)