TRUNK-4417 Added missing hashCode methods