Public and private clients can now have different expiry times

Public clients often wish to have shorter expieration times
Merge branch 'no-client-secret'