MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445448 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1445456 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote-tracking branch 'origin/trunk-gd' into fb-YAHOO-238-trunk-gd
Fix TestNameEditsConfigs which is broken after the merge