CRM-12556 - Fix regressions in api_v3_RelationshipTest and api_v3_ActivityTest

----------------------------------------
* CRM-12556: Assign api_key for a user via command-line
  http://issues.civicrm.org/jira/browse/CRM-12556
Merge pull request #1211 from totten/master-userid-regr

CRM-12556 - Fix regressions in api_v3_RelationshipTest and api_v3_ActivityTest