OF-163: Properly filter roster groups by user

Merged patch contributed by Ashley Ward.