MAPREDUCE-5095. TestShuffleExceptionCount#testCheckException fails occasionally with JDK7. (Contributed by Arpit Agarwal)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1484577 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-3859. Fix CapacityScheduler to correctly compute runtime queue limits for high-ram jobs. Contributed by Sergey Tryuber.

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