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