Merge -r 1448614:1448615 from trunk to branch. Fixes: MAPREDUCE-4951. Container preemption interpreted as task failure. Contributed by Sandy Ryza.