use map diffing rather then list diffing for claim lists

Change-Id: I882e83eee1f8a6849017e7950df96dddc777bf5a