HDFS-5255. Distcp job fails with hsftp when https is enabled in insecure cluster.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528279 13f79535-47bb-0310-9956-ffa450edef68
move HADOOP-9758 to the branch-2.1.2 section

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528288 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528293 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-286-trunk-gd