YARN-2204. Addendum patch. TestAMRestart#testAMRestartWithExistingContainers assumes CapacityScheduler. (Robert Kanter via kasha)

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

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