Make compatible with planned DataModel 6.1 release
The change in the test setup is expected, because EntityIdValue's are
now serialized with the "id" field. This disables the formerly used
legacy parser and requires the EntityIdParser to be properly configured.
Change-Id: I0cf3464cc75d7c66039ca02c13d677e09de13ae7