(cherry picked from commit c5929c00a35a8e58bcf1c80d9d414c3cbdce4483) Conflicts: hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml (cherry picked from commit 80d46360671f2d52bbe5ff3683b661f6f8adfe7d) Conflicts: hadoop-project/pom.xml
(cherry picked from commit c5929c00a35a8e58bcf1c80d9d414c3cbdce4483) Conflicts: hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml (cherry picked from commit 80d46360671f2d52bbe5ff3683b661f6f8adfe7d) Conflicts: hadoop-project/pom.xml