6a1ce74fb1
Contributed by Daryn Sharp, Xiao Chen, Rushabh S Shah. (cherry picked from commit 5ec86b445cc492f52c33639efb6a09a0d2f27475) (cherry picked from commit e93e401f492c7fc112da3d0c63b3b186c1b196ec) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSClientProvider.java