YARN-1221. With Fair Scheduler, reserved MB reported in RM web UI increases indefinitely (Siqi Li via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1527796 13f79535-47bb-0310-9956-ffa450edef68
YARN-1247. test-container-executor has gotten out of sync with the changes to container-executor. (rvs via tucu)

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