Merge pull request #2732 from apache/jwt-controls-2

Enhance JWT controls (again)