WIP: prevent illegal downgrade
Fix feature spec for plan_update
Merge remote-tracking branch 'origin/plan-upgrade-broker-wip'