(cherry picked from commit af508605a9edc126c170160291dbc2fe58b66dea) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRecovery.java (cherry picked from commit f70f522e805b2d8dd49bae07fc65d37a78ad2fca)