(cherry picked from commit 8cecad2d564d89d0f56e98de80a6f9b0bcb39d7a) Conflicts: dev-support/test-patch.sh hadoop-common-project/hadoop-common/pom.xml
(cherry picked from commit 8cecad2d564d89d0f56e98de80a6f9b0bcb39d7a) Conflicts: dev-support/test-patch.sh hadoop-common-project/hadoop-common/pom.xml