Git commits in Moodle 3.3.5 by Dan Marsden

commit e3db31ac67e77b6bd4b063336fd15577fb5f2ba1
Author: Dan Marsden <dan@danmarsden.com>
Date:   Thu, 01 Feb 2018 15:58:31 +0800
Tag:    v3.3.5

MDL-60421 tool_cohortroles: fix deprecated call.

commit 457fcfe3d070b2b65829688b5dd0db2673a31f30
Author: Dan Marsden <dan@danmarsden.com>
Date:   Mon, 11 Dec 2017 10:33:15 +0800
Tag:    v3.3.5

MDL-61005 core_cohort: Allow teachers to view site-wide cohorts