Merge proposals dependent on lp://staging/~savilerow-team/savilerow/unity-scope-selfserviceupgrades-newapi

1. unity-scope-selfserviceupgrades-newapi
2. Dependent merge proposals