Deletion from TermIndex based on EntityId

Previously, a full Entity object had to be supplied in order to
remove entries for an entity from the TermIndex. An EntityId
should however be sufficient.

Change-Id: Idd9ca4b095d88f23ef85aa685b2e40e19032b424
Merge "Deletion from TermIndex based on EntityId"