HDFS-6273: Merging r1589803 from trunk to branch-2.

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589809 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1589859 FIXES: YARN-1975. Used resources shows escaped html in CapacityScheduler and FairScheduler page. Contributed by Mit Desai


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589860 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10539. Merging change r1589884 from trunk to branch-2.

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