Backport plugin init changes from 7.0
Expand Pubsub support for subscriptions and affiliations
6.6.0