(cherry picked from commit 680be58aac03a9ffab6b07c8fde9602ddb9dc858) (cherry picked from commit d157733082697e67be56f516606a0127f5830c58) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java (cherry picked from commit a7f1dc8aa8c602faf9745588cba1e337f0e59afd) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java