make getEntityIdForClaim use ClaimGuidParser

Change-Id: I4733cfd29e46eef891e36d44d08b75a4a1f96973