Merge remote-tracking branch 'origin/dev-token-authorization' into release/2.9.5rc
set 2.9.5 in pom.xml
Merge branch 'master' into dev-orcid-integration

Conflicts:
	pom.xml
Updating unit tests with new method signature
Incrementing release