Update entity types to use attributes

Kristiaan Van den Eynderequested to merge
issue/group-3506097:3506097-convert-entity-type into 4.0.x

Closes #3506097

Merge request reports