MDL-23566 mod_lesson: Float answers so paragraphs line up correctly next to the inputs
MDL-45483 mod_forum: corrects values for maxattachments in forum settings
MDL-45380 theme_bootstrapbase: Restore config override highlight

Conflicts:

	theme/bootstrapbase/less/moodle/admin.less
	theme/bootstrapbase/style/moodle.css
MDL-45135 mod_glossary: fix RTL alignment of table

Tablelib has a specific 'hook' to allow alignment to be corrected for
RTL languages, but needs to be specified direction in lowercase.
MDL-32543 (backport) Make sure the action and url fields of log table have correct sizes
MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding
MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding
MDL-43833 quiz reports: persist states settings between pages.
MDL-45455 quiz cron must rollback transaction on error.
Merge branch 'MDL-44634-25' of https://github.com/dbezborodovrp/moodle into MOODLE_25_STABLE
Merge branch 'MDL-23566_25' of https://github.com/aolley/moodle into MOODLE_25_STABLE
Merge branch 'MDL-32543-25' of https://github.com/danielneis/moodle into MOODLE_25_STABLE
Merge branch 'wip-MDL-45483-MOODLE_25_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45455_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
Merge branch 'MDL-43833_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45135-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45380-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css