MDL-26017 enrol: Add keyholder role
Merge branch 'MDL-26017_master' of https://github.com/ndunand/moodle into MDL-26017_master

Conflicts:
	enrol/self/locallib.php