HADOOP-9977. Hadoop services won't start with different keypass and keystorepass when https is enabled. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525657 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5139. Remove redundant -R option from setrep.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525659 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5139. Remove redundant -R option from setrep (update CHANGES.txt).

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525665 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby)


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