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

Change-Id: I780a8c7715b5a00d89e4e29fa8de49ee65024827
Modify the delete approvals endpoint to support approval deletes by clientId

Change-Id: Ibf627ec2d6ef92fc50b1fbe21a11e787e8cb67f3