Add UUID field to custom token entities.

Closes #3567563

Merge request reports

Loading