Added spec for SSO override username/email changes
Merge branch 'fix-sso-override' into korstenrp