(cherry picked from commit 55ed6558bad5d76ce4ebf958fc101a48032a0cd1) Conflicts: hadoop-common-project/hadoop-common/pom.xml