DM 1.0 compat: do not use Entity::toArray

Change-Id: Ie53b1851564ef599eeb7d886a7fd41051b7d72a0
Merge "DM 1.0 compat: do not use Entity::toArray"