(cherry picked from commit 875256834b892b574499d5fe68f95a9aed244f7d) Conflicts: hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestAuthenticationToken.java hadoop-common-project/hadoop-common/CHANGES.txt