Fix entity type manager usage.

Andrei Mateescurequested to merge
issue/field_defaults-3612667:3612667-clash-with-trash into 2.1.x

Closes #3612667

Merge request reports