CRM-13978 - Replaces PR 2219 which had all the right changs BUT omitted ...

...the activity tagset filter.

----------------------------------------
* CRM-13978: search on activity result field
  http://issues.civicrm.org/jira/browse/CRM-13978