Resolve #3616776 "SubscriptionEntity::getPlan() ignores connector_plugin_id, allowing cross-connector plan_id collisions"

Colan Schwartzrequested to merge
issue/subscription_manager-3616776:3616776-connector-aware-getplan into 1.0.x

Closes #3616776

Merge request reports