YARN-541. getAllocatedContainers() is not returning all the allocated containers (bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1502906 13f79535-47bb-0310-9956-ffa450edef68
YARN-763. AMRMClientAsync should stop heartbeating after receiving shutdown from RM (Xuan Gong via bikas)

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