Bug 724: Handle hashCode/equals properly in InstanceIdentifier