(cherry picked from commit 9ccb849eb69f05bccc3435306ec4bde104e411bf) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/SSLFactory.java