Have DescriptionMatchFinder return instances of EntityId rather then internal ids.

Change-Id: Ibc104d0545e12ac5f6dfe31014056087db278e44