[TIMOB-18089] JSType->TiType
[TIMOB-18089] Bump version to 21
Merge pull request #6397 from vishalduggal/timob-18089-35X

[TIMOB-18089] (3_5_X) Move from JSType to TiType