CRM-15555 - Fix fatal error from protected vars (contactID and context).

----------------------------------------
* CRM-15555:
  https://issues.civicrm.org/jira/browse/CRM-15555
Merge pull request #4533 from davecivicrm/CRM-15555

CRM-15555 - Fix fatal error from protected vars (contactID and context).