token service refactoring
Merge remote-tracking branch 'upstream/master'
Merge pull request #720 from patriot1burke/master

token service refactoring