MAPREDUCE-6198. NPE from JobTracker#resolveAndAddToTopology in MR1 cause initJob and heartbeat failure. (zxu via rkanter)
Merge remote-tracking branch 'remotes/origin/branch-1' into branch-1