Fixed profile loading during auth
Fixed bug where openid profile details are being overwritten with provider user attributes
Merge branch 'expiry-token'