merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
Fixes to MR CHANGES.txt to bring jiras under the correct release. At least 2.0.4 onwards in sync with trunk.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466779 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-225-branch-2-gd