Makes OrganizationService take advantage of the generic services.
Merge commit 'fcc119bcba6e7b31075891c499dcc5eaefc57118' into HEAD