Add per-grant-type token expiration durations
Modify tests and plumbing