MDL-38794 passed overflowdiv parameter
MDL-37804 mod/assign: Students no longer able to submit files after due date with Prevent late submissions turned on.
MDL-41497 enrol_database: Added help text for using odbc dsn names instead
MDL-41497 auth_db: Added help text for using odbc dsn names instead
MDL-41254 backup Raise time and memory limit in precheck.
MDL-40631: Prevent students from submitting empty assignments.

Conflicts:

	mod/assign/locallib.php
	mod/assign/tests/locallib_test.php
MDL-38267 assign: No Submit button after cut-off date

Conflicts:

	mod/assign/locallib.php
	mod/assign/tests/locallib_test.php
MDL-41517 Do not call fix_course_sortorder unnecessarily

Thanks to Thomas Worthington
 MDL-23335 mod_forum: allow multi-lang filtering of shortened messages

MDL-23335 mod_forum: Correct ordering of filtering and shortening
MDL-28561 blocks_rss_client: Fixes lines between RSS feed items are not showing in all themes.
MDL-29378 Fix regression in the Survey/COLLES P+A module

This basically reverts the commit 5196df589b0fbcead4a0943c8e7b227f8a98c897 that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).

This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.
MDL-29378 Fix the form display in the Survey/COLLES P+A module

In MDL-7501, we stopped using rowspanning cells in the form table due to
accessibility. That had introduced a regression so in the COLLES P+A survey,
all the rows were displayed with the same background colour. This patch returns
the previous behaviour that each couple of items can be distinguished by the
background colour.

Also, there is no need to display "I prefer that" and "I found that" as a small
text any more. It had made sense in rowspanning layout but not after MDL-7501
was fixed.

And finally, as all items are enumerated now sequentially, there are actually
48 lines, each couple covering one question in two variants. I think it's
correct to reflect this in the description of the form so the text was slightly
amended.
MDL-29378 Code cleanup in the Survey module

While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.

The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).
MDL-41163 Restore: Large course restore timeout on schema page
MDL-41626 cas auth: Setting the right url for the multi-authentication page
MDL-41528 enrol/ldap course default settings when no course template is selected
MDL-41451 - Large forms are truncated by max_input_vars

By parsing php://input in chunks, we can bypass max_input_vars for
forms which do not use the "multipart/form-data" enctype.  This can
be (and is) safely skipped if there are fewer than max_input_vars
fields submitted as part of $_POST.
MDL-41630 oauth: Throw exception instead of dying on error
MDL-32862 - Backup: Rewriting resource_old links on backup.
MDL-41417 course: prevent duplicate idnumbers being used when updating a course