(cherry picked from commit 4a56bde6ba1f72588a25cd96acc76089706cb786) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationHandler.java
(cherry picked from commit 4a56bde6ba1f72588a25cd96acc76089706cb786) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenAuthenticationHandler.java