CRM-12928 fixes

----------------------------------------
* CRM-12928: Merge contacts fatal error: Unknown column 'source_contact_id' in 'where clause (related to activity restructure)
  http://issues.civicrm.org/jira/browse/CRM-12928