Issue #1965760 by joachim: Fixed flags using the wrong token type for entity types whose token type different from the entity type name. Adds soft dependency on Token module for flag-related tokens on other entities.