WIP commit for updateServicePlanVisibilityForBroker()