Merge proposals dependent on lp:~canonical-isd-hackers/canonical-identity-provider/fix-api-email-error

1. fix-api-email-error
2. Dependent merge proposals