MAPREDUCE-4893. Fixed MR ApplicationMaster to do optimal assignment of containers to get maximum locality. Contributed by Bikas Saha.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440749 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8981. Merge r1422279 from branch-trunk-win to trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440780 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of github.com:griddynamics/yhadoop-common into trunk-gd
Merge branch 'trunk-gd' of github.com:griddynamics/yhadoop-common into fb-YAHOO-159-trunk-gd