(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 8fe4b2429a22cf932b701863170336a3b6986dd2)
(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 8fe4b2429a22cf932b701863170336a3b6986dd2)