Remove the code that allow us to turn off the persistent tokens functionality
Fix unit test
Fixing unit tests, running integration tests
Merge pull request #1663 from ORCID/Card1705

Card1705