YARN-708. Deleting files that were supposed to removed in the previous commit.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485482 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485491 ../../trunk/


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