Added claims diffing and added this to entitydiff

Change-Id: I2b8fe753ff7ca00f1e1362b08ebfd0099c6127cc
Merge "Added claims diffing and added this to entitydiff"