Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle

Conflicts:
	lib/db/services.php

diff --cc lib/db/services.php
index 50acf7c,8ae3114..c5b02a3
--- 1/lib/db/services.php
--- 2/lib/db/services.php
+++ b/lib/db/services.php
@@@ -1034,8 -1033,7 +1043,9 @@@ $services = array
              'core_course_get_courses',
              'core_completion_update_activity_completion_status_manually',
              'mod_data_get_databases_by_courses',
 +            'core_comment_get_comments',
 +            'mod_forum_view_forum',
+             'core_course_view_course',
              ),
          'enabled' => 0,
          'restrictedusers' => 0,