Merge branch 'MDL-27619_master' of git://github.com/pauln/moodle
Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle
MDL-36644 Assignment: prepend the course upload limit to the options array

Ensure that the course upload limit is the first option in the list of available choices for the Maximum submission size select.
MDL-33448 enrol_manual: Reordered things to improve JS performance when enrolling users
MDL-33448 enrol_manual: Reduced JS get_string calls for the yui widget
MDL-29334 mod_data: if site-wide presets created in <= 1.9 exist convert them to 2.x
MDL-32639 files: Improved File Manager download and zip support
MDL-32639 files: Zipping a folder does not overwrite existing files
MDL-36897 quiz review: fixup previous commit.
MDL-37014 repository_webdav - strip the server URL from file & folder paths returned by webdav lib (if present)
MDL-37078: Restore - section restore fails with multiple availability conditions
Merge branch 'MDL-36897' of git://github.com/timhunt/moodle
MDL-30700 tablelib: Fixed get_sort_for_table to work with text sorting columns for oracle

This change stores the list of columns that require text sorting in the session,
so the static function "get_sort_for_table" can work without any additional parameters.
MDL-37143 External_warnings: developer should be able to modify the item/itemid/errorcode description
MDL-35874 - Blocks - Adding a label to the 'Add a block' block's select field
Merge branch 'MDL-30700-master' of git://github.com/damyon/moodle
MDL-28585 LDAP Auth doesn't handle password expiration

All credit goes to Mark Ward for proposing the initial patch.

Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
MDL-37165 Assignment: Oracle fix for count_submissions_with_status (and friends).

Oracle does not like the use of AS after a join.
MDL-36456 repository: S3 handles errors in a nicer way
weekly on-sync release 2.5dev