Revert "Removed subscriberlistener"
Revert "Removed subscriberlistener"

This reverts commit 7f6bb4b05e74ba8b277924b5a8174b23df5ba18e.

The SubscriberListener is needed to fix a race condition.

EndPointCorp/appctl,EndPointCorp/appctl