MAPREDUCE-5891. Improved shuffle error handling across NM restarts. Contributed by Junping Du
(cherry picked from commit 2c3da25fd718b3a9c1ed67f05b577975ae613f4e)