Canonical SSO provider

Merge proposals dependent on lp://staging/~stuartmetcalfe/canonical-identity-provider/more-2f-fixes

  1. more-2f-fixes
  2. Dependent merge proposals

lp://staging/~stuartmetcalfe/canonical-identity-provider/more-2f-fixes has no merge proposals.