Merge branch 'MDL-35864' of https://github.com/danielneis/moodle

diff --cc enrol/database/lib.php
Simple merge

diff --cc enrol/imsenterprise/lib.php
Simple merge

diff --cc lib/enrollib.php
Simple merge