YARN-576. Modified ResourceManager to reject NodeManagers that don't satisy minimum resource requirements. Contributed by Kenji Kikushima.
svn merge --ignore-ancestry -c 1476824 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476825 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5179. Fix unit test in TestHSWebServices which fails when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1476835 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476836 13f79535-47bb-0310-9956-ffa450edef68
YARN-516. Reverting the patch from branch-2 as HADOOP-9357 also got reverted.


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