MAPREDUCE-5891. Improved shuffle error handling across NM restarts. Contributed by Junping Du