CC saves value of 'plan_updateable' when received in catalog

wip
Merge remote-tracking branch 'origin/plan-upgrade-broker-wip'

This commit also includes back-filled tests for the logic introduced in
the wip branch.