Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle
MDL-44342 message_airnotifier: Fix for unit tests.
Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle
Merge branch 'MDL-44948' of git://github.com/timhunt/moodle
Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle
Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
MDL-43682 report_loglive: fixed lint warning in fetchlogs JS
MDL-43682 report_loglive: commit built yui files
Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle
MDL-44342 message_airnotifier: Fix shifter warnings in JS
Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle
Merge branch 'wip-MDL-44340-master' of git://github.com/abgreeve/moodle
Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle

Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
MDL-40907 events: Allow one event write several entries to the legacy log table
MDL-40907 events: view list of resources in course
MDL-40907 events: additional legacy logging for module update/add events"
MDL-44070 Conditional availability - white space fix