Merge -c 1239443 from trunk to branch-0.23 to fix MAPREDUCE-3780. Fixed a bug where applications killed before getting activated were not getting cleaned up properly.