Coding done
Fixing unit test
Merged with latest master
Merge pull request #1158 from ORCID/AddEncryptedEmailToDeactivateLink

Coding done