HADOOP-13815. TestKMS#testDelegationTokensOpsSimple and TestKMS#testDelegationTokensOpsKerberized Fails in Trunk.

(cherry picked from commit 61c0bedf775e6e794d4704485ec2c41a95aecae9)
(cherry picked from commit efc9ffc3b62a3de7660ab6fadeb59c8c2bca368b)

hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java

@@ -1820,8 +1820,11 @@ public class TestKMS {
                 Assert.fail("client should not be allowed to renew token with"
                     + "renewer=client1");
               } catch (Exception e) {
+                final DelegationTokenIdentifier identifier =
+                    (DelegationTokenIdentifier) token.decodeIdentifier();
                 GenericTestUtils.assertExceptionContains(
-                    "tries to renew a token with renewer", e);
+                    "tries to renew a token (" + identifier
+                        + ") with non-matching renewer", e);
               }
             }