(cherry picked from commit 92ea6d74ecd84b86771e285902dd2a80bccbe3ea) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/util/ErasureCodingCliCmdExecutor.java hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml