ChangeOpClaim now uses the claim guids

Change-Id: I117f0b10ee4e1782bbaaad77248e226773b23a64