Merge branch 'api-versioning' into api-versioning-2-facade-registry

Changes to how upgrade tag is handled interacted with changing how
Upgrader is instantiated.
merge in the fix, which doesn't really apply here anymore anyway