Fixed bug that caused client to request non-portable CDI events from server after a bus reconnect
Fixed ERRAI-627: ClassCastException from DynamicDeliveryPlan
Merge branch '2.4'