Merge proposals dependent on lp://staging/~canonical-isd-hackers/canonical-identity-provider/redirect-url

1. redirect-url
2. Dependent merge proposals