(cherry picked from commit 212342d6db14673f8f5652a5209e1c4fcc0f0ede) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java
(cherry picked from commit 212342d6db14673f8f5652a5209e1c4fcc0f0ede) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java