SI-8226 Deduplicate Scala's Tokens and JavaTokens
Merge pull request #3456 from soc/SI-8226

SI-8226 Deduplicate JavaTokens/ScalaTokens