TEZ-933 addendum. Fix a unit test to work correctly. (sseth)
TEZ-936. Remove unused event types from AMSchedulerEventType. (sseth)