CIDEVSTC-238: Updates for security tokens
Merge pull request #597 from mmeisinger/add238_tokens

CIDEVSTC-238: Updates for security tokens