20c9a12bc7
(cherry picked from commit db7e636824a36b90ba1c8e9b2fba1162771700fe) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java (cherry picked from commit 399645ebc162371a63eb81840e01ed52261f43bc)