Whitelisting jwt and enabling decryption of whitelisted addons

Core changes required for the JWT token PR.
The config has changed between the 2, it's not actually the same condition.