MDL-46338 enrol_self: Icon should indicate enrolment availability
Merge branch 'wip-MDL-46338-master' of git://github.com/marinaglancy/moodle
MDL-36014 cohorts: fix string names

Cohort capabilities are defined in lang/en/roles.php, remove(rename) the capability-styled strings

AMOS BEGIN
 CPY [cohort:assign,core_assign],[assigncohorts,core_assign]
AMOS END
MDL-36014 cohorts: Allow teachers to view cohorts

defined new capability 'moodle:cohort/viewabove' and property 'visible' for cohorts.
Combining them will allow to make cohorts visible to teachers