Cleanup of ClaimModificationHelper and related

 - Removes the dependancy on ApiBase
 - Removed the dependancy on EntityContentFactory
 - Catch some uncaught exceptions
 - Refactor a large method in ModifyEntity
 - General cleanup!

Change-Id: Ibfd6ce7666b328b3ccc3e15bf835c8ba7d93526f