Merge proposals dependent on lp:~nick-moffitt/wordpress-teams-integration/fix-openid-finish-auth-hook

1. fix-openid-finish-auth-hook
2. Dependent merge proposals