Updated AbstractEntityDescriptor to use equals() and hashCode() based on targetUuid