Merge -c 1484596 from branch-1 to branch-1.2 to fix 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.2@1484597 13f79535-47bb-0310-9956-ffa450edef68