CRM-12274

FIX api and CRM tests, fix all fatal errors
----------------------------------------
* CRM-12274: Merge activity tables into one unified table activity contact table
  http://issues.civicrm.org/jira/browse/CRM-12274