(cherry picked from commit 9216993b027fde7c0ae47f25432a3776b5f21f6b) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java
(cherry picked from commit 9216993b027fde7c0ae47f25432a3776b5f21f6b) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java