MAPREDUCE-5206. Ensure that a job doesn't get added to RetiredJobs multiple times in JobTracker. Contributed by Arun C. Murthy.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1479589 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4838. Addendum patch to fix TestRumenJobTraces.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1479598 13f79535-47bb-0310-9956-ffa450edef68