MDL-34020: Further work on IMS package importing when using Blackboard packages
MDL-41506 theme_bootstrapbase: Implement highlight class
MDL-43714 blocks: fixed notice when moving to an empty region
MDL-43714 blocks: fixed coding style of ajax/blocks.php
MDL-43760 Potential fix for fletcher scott issues with fullname.
Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle
Merge branch '43714-27' of git://github.com/samhemelryk/moodle
Merge branch 'mdl34020-master' of https://github.com/tlock/moodle
MDL-43661 change event property level to edulevel

Level is a reserved word in sql, sorry.
MDL-43661 use new edulevel in all existing events
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-26680 my page My Moodle "reset to default" button
Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle
Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-26680: Reset my moodle page - add sesskey check.
MDL-43736 Events: event->contextinstanceid should be used where possible

While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
MDL-43736 Events: Updated unit test to test context not used in event