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