Minimal content entity changes to fix DomainCreate test