Moving recent bug-fixes to hadoop-2.2.1.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530128 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5316. Namenode ignores the default https port. Contributed by Haohui Mai

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1530150 13f79535-47bb-0310-9956-ffa450edef68