[CXF-5684] - Change token storing logic to allow to store "expired" tokens
[CXF-5684] - Flaw in token storing logic when configured to allow token renewal after expiry
Adding back in some commented out code