YARN-764. blank Used Resources on Capacity Scheduler page (Nemon Lou via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1490387 13f79535-47bb-0310-9956-ffa450edef68
YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas)

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