Search by participant role does not work in Search Builder

I patched my 4.4 install using this PR:
https://github.com/civicrm/civicrm-core/pull/2355/files

Search by participant role now works (returns rows) but found the following issues on my patched site:

-----------------

1. Search Builder and Find Participants Exports - missing Participant Role data and throws notice
Search Builder - Search for Participant > Role = Volunteer
Then export Primary Fields

• Export has Participant Role column header, but all cells are empty.

• Cancel from export (to return to search) throws these Notices:
  Notice: Undefined index: Volunteer in CRM_Export_BAO_Export::exportComponents() (line 792 of /Users/dgg/git/crm_v4.4/CRM/Export/BAO/Export.php).

If a participant has > 1 role, then the notice shows an empty undefined index:
Notice: Undefined index: in CRM_Export_BAO_Export::exportComponents() (line 792 of /Users/dgg/git/crm_v4.4/CRM/Export/BAO/Export.php).

2. Search Builder AND Find Participants results - Participant Role is empty if participant has > 1 role assigned
(regression from 4.3)

Edit and existing participant and check Host AND Speaker for roles.
Find Participants (or Search Builder) for participant w/ role = Speaker

• You'll get your edited participant in result set (correctly), but the column will be empty. in 4.3 you would see comma separated list ("Host, Speaker").