Resolve #3599146 "Remove entity types"

Alex Pottrequested to merge
issue/content_lock-3599146:3599146-remove-entity-types into 3.x

Closes #3599146

Merge request reports