Merge pull request #21261 from totten/master-test-jwt