MDL-42495 lesson Prevent coding error for invalid user
MDL-34020: Further work on IMS package importing when using Blackboard packages
MDL-43211 course: do not return indent icon if not needed
MDL-43211 blocks: style edit icons in main menu and social activities
MDL-43401 mod_lesson: Fix serving of the pluginfile mediafile
MDL-43333 blocks: move activity icon in social and main menu
MDL-41693 group: Use standard layout for group related pages
MDL-40139 block_privatefiles: Prevent usage of unmaintained edit page
MDL-39683 Messages, Themes: Fix "my" and "other person" message alignment in RTL mode (theme/clean)
MDL-39683 message: RTL alignment of messages in theme_base
MDL-39684 theme: RTL align of restrictions label in file manager
MDL-41362 theme_bootstrapbase: Alignment of User Selector controls
MDL-40752 Login RTL: Swapping the panels on two-panel login pages for RTL

Additions to the patch made by Jason Fowler <phalacee@gmail.com>
MDL-41506 theme_bootstrapbase: Implement highlight class
MDL-43693: assignment: Fix JS error on grading page.
MDL-40533 block_html: Remove styles specific to the block
MDL-43700 reports: Update to the sql in the comment locallib to include additional name fields.
MDL-43306 restore: Fix grade_item sortorder after restoring course

While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.

Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
MDL-42682 theme_bootstrapbase: fixed forum search alignment

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-42682 theme_bootstrapbase: fixed styling of discussion selector

Conflicts:
	theme/bootstrapbase/style/moodle.css