CRM-13863 Fix group popups
Merge pull request #2418 from colemanw/master

CRM-13863 Fix group popups