HDFS-5322. Merge change r1531436 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531440 13f79535-47bb-0310-9956-ffa450edef68
YARN-1044. used/min/max resources do not display info in the scheduler page (Sangjin Lee via Sandy Ryza)

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

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