(cherry picked from commit 070548943a16370a74277d1b1d10b713e2ca81d0) Conflicts: hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java
(cherry picked from commit 070548943a16370a74277d1b1d10b713e2ca81d0) Conflicts: hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMSAudit.java