MDL-44979 behat: no need to purge all cache again
MDL-45081 curl: Prefer usage of CURLFile over @file arguments
MDL-45076 theme_bootstrapbase: Select placement in participants page

Usually the group selector is aligned with the label, but as we want
it to be consistent with the rest of the selects in the participants
page we need an override.

Conflicts:

	theme/bootstrapbase/style/moodle.css
MDL-45076 theme_bootstrapbase: Clean up participants controls LESS

Conflicts:

	theme/bootstrapbase/style/moodle.css
MDL-45100 fix course_context classname PHPDdos typo in context API
Merge branch 'w16_MDL-45100_m25_coursecontext' of https://github.com/skodak/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45076-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-43277 block_navigation: Trim from the left for long names
Merge branch 'MDL-45081-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Merge branch 'wip-mdl-44979-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
MDL-44977 tool_profiling: set xhprof default settings

Set xhprof default settings, even if xhprof is not installed.
If xhprof is not installed, hide profiling admin settings,
else show them.
This is needed, because if xhprof is installed, then it will
fail all non-js behats which navigate to setting under
site administration, as profiling settings get displayed on
default admin page.
Merge branch 'wip-mdl-44977-m25' of https://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
MDL-44951 theme_bootstrapbase: forum post css tweak backport

Adjusted forum post CSS for cleaner appearance.
MDL-45119 ajax: AJAX exceptions need a String in the Link
weekly release 2.5.5+
MDL-42823 tool_generator - ability to disable the tool_generator