Ensure entity types have an ID

Alex Pottrequested to merge
issue/entity_usage-3589933:3589933-no-id-8.x-2.x into 8.x-2.x

(cherry picked from commit a64499a9)

Closes #3589933

Merge request reports