Issue #2385699 by znerol: Use upstream AbstractEventDispatcherTest as the base class of ContainerAwareEventDispatcherTest