TestRMApplicationHistoryWriter sometimes fails in trunk. Contributed by Zhijie Shen

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606834 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1606855 merging from trunk to branch-2 to fix:HDFS-6558. Missing newline in the description of dfsadmin -rollingUpgrade. Contributed by Chen He.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606856 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10710. hadoop.auth cookie is not properly constructed according to RFC2109. (Juan Yu via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606925 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6591. Merging change r1606927 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606931 13f79535-47bb-0310-9956-ffa450edef68