use map diffing rather then list diffing for claim lists

Change-Id: I882e83eee1f8a6849017e7950df96dddc777bf5a
(bug 44101) fixed assertion violation caused by inconsistent state of Claims object

Change-Id: Ia693fbde8d6b85875ceaf4fbad186da12ba7f900