Merge proposals dependent on lp:~maxiberta/canonical-identity-provider/prevent-forgot-password-user-enumeration

1. prevent-forgot-password-user-enumeration
2. Dependent merge proposals