Merge -c 1493445 from trunk to branch-2.1-beta to fix MAPREDUCE-5192. Allow for alternate resolutions of TaskCompletionEvents. Contributed by Chris Douglas.