[UID2-3242] Handle lifetime check for v2 tokens differently

[UID2-3242] Handle lifetime check for v2 tokens differently #8