(cherry picked from commit e71f61ecb87e04727a5a76e578a75714c9db6706) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
(cherry picked from commit e71f61ecb87e04727a5a76e578a75714c9db6706) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java