Issue #2163027: Type token returns in a typed data recognizable format

Closes #2163027

Re-Rolled patch 2163027_22.patch from #2163027-22 for 10.1.x branch.

Question : Do we need to remove Deprecated code in core/modules/user/user.tokens.inc Line 32 ?