Fix for CAMEL-7611

Equals and hash code in KeyValueHolder now are consistent.