Merging multivalue custom fields doesn't merge, it replaces

Unlike other multivalue things, multivalue custom fields clober the original contact data with the new contact data. It needs to instead merge the two. This patch accomplishes that but it's a patch against 2.1 so it might needs some work to get it working with trunk. Also this patch is only for Checkbox fields, if I recall there is another type of multivalue custom field.