HADOOP-10029. Merging change 1531125 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531126 13f79535-47bb-0310-9956-ffa450edef68
YARN-1265. Fair Scheduler chokes on unhealthy node reconnect (Sandy Ryza)

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