(cherry picked from commit 16c07cc68a3e0a06f57b7f4c7207cc8e5dce211f) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java (cherry picked from commit 456fe08a6dcf1168f478a1bdd9f2dc3b4ff59810)
(cherry picked from commit 16c07cc68a3e0a06f57b7f4c7207cc8e5dce211f) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripedDataStreamer.java (cherry picked from commit 456fe08a6dcf1168f478a1bdd9f2dc3b4ff59810)