(cherry picked from commit 6f03959e4dc0bc11030fd7e30a025447a4d6948a) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
(cherry picked from commit 6f03959e4dc0bc11030fd7e30a025447a4d6948a) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java