(cherry picked from commit 771f798edf97b27ae003395118c0317b484df6ee) Conflicts: hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
(cherry picked from commit 771f798edf97b27ae003395118c0317b484df6ee) Conflicts: hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java