Make ClaimGuidGenerator behave like a service

This makes ClaimGuidGenerator take an EntityId in the
newGuid() method instead of the constructor.

Change-Id: Ifd96ab78424d7b674323becb310294d00b367e73
Merge "Make ClaimGuidGenerator behave like a service"