Security token ttl updates
Merge pull request #1169 from ryanjbaxter/master

Security token ttl updates