(cherry picked from commit 85aacaadb5a3f8c78b191867c0bde09b3c4b3c3c) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java (cherry picked from commit a20b943cf951cf38eb4950177c826bbcf424aade)