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