Match EntityId changes in DataModel

Mostly applied regexes to construct ItemId and PropertyId rather then
EntityId. Also fixed some code that got broken due to the moving out of
the DV code from EntityId into EntityIdValue.

Change-Id: Ia7ad9da1210e4c8a19bdb2e644e629258645ef2d
(cherry picked from commit aa53f20b2fdf1cc700f82719087a9917dd1aa995)