(cherry picked from commit 30f85d7a88a110637757cf7a1f4cdc9ed40f59fb) Conflicts: hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml
(cherry picked from commit 30f85d7a88a110637757cf7a1f4cdc9ed40f59fb) Conflicts: hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml