Allow both JWT grant types.
Allow both JWT grant types 4realz.
Merge pull request #1683 from bendiy/4_6_x

Allow both JWT grant types.