WIP: JWT token generation fixes in progress #12

Closed
pasindu wants to merge 2 commits from minorFixes into apim420