various updates to ensure our customizations use new civicrm_activity_contact table