Fix api_manager failing tests about cohorts
Merge pull request #259 from aboudreault/cohorts-rebase

Fix api_manager failing tests about cohorts