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