CF-244: Fix logic in JwtTokenEnhancer so verifier and signer are consistent

Change-Id: I780a8c7715b5a00d89e4e29fa8de49ee65024827