Use EntityRevision for EntityData

This replaces the use of EntityContent with EntityRevision
in the EntityData facility.

Change-Id: I81f519a2889b6a2d6a33789aeb00c469ee61bafc
Merge "Use EntityRevision for EntityData"