(cherry picked from commit 5644137adad30c84e40d2c4719627b3aabc73628) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockUnderConstructionFeature.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java (cherry picked from commit dd462bc32f77799827c1bd438ee8fa54dacb20eb)