YARN-1271. Addendum patch to remove unused method in ContainerExecutor. Contributed by Sandy Ryza.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529386 13f79535-47bb-0310-9956-ffa450edef68
YARN-1273. Fixed Distributed-shell to account for containers that failed to start. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1529389 ../../trunk


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