DM 1.0 compat: stop using Entity::toArray and ObjectComparer

Change-Id: I9a8764ddde511105e03285cf6264db02dee7ae68