Fix cohort authoring for pages and activities
Merge branch 'itsisu-production' into selectmedia