Feedback round # 2
Merge pull request #1545 from ORCID/Card1591_feedback_2

Feedback round # 2
Corrected email source for when the source is an ORCID iD.
Added compatibility for when the work source is a client ID not and
ORCID iD.
rewrite test to match new layout
Merge pull request #1546 from ORCID/fixSourceValidityProblems

Fix source validity problems
Merge pull request #1547 from ORCID/workTest3

rewrite test to match new layout
If the email exists, show the login form
Merge pull request #1548 from ORCID/OnOauthShowLoginFormWhenEmailExists

If the email exists, show the login form
Merge branch 'master' into fundingRefinement