MDL-37536 cache: fixed typo
Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle
MDL-37339 Administration: Unique custom profile should not be checked if it's empty.

Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
Merge branch 'MDL-36412-master' of git://github.com/sammarshallou/moodle
Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle
Merge branch 'w02_MDL-37175_m25_paypalmanage' of git://github.com/skodak/moodle
Merge branch 'w02_MDL-35899_m25_cohortsort' of git://github.com/skodak/moodle
Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle

Conflicts:
	files/renderer.php
	lib/outputrenderers.php
MDL-36708 files: Fixed missing key in array
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-31484_anonymous_user_clash' of git://github.com/davosmith/moodle
Merge branch 'w02_MDL-37187_m25_flatfile' of git://github.com/skodak/moodle
MDL-36968 Move function print_recent_activity() to the block recent_activity
MDL-36553: Admin settings: remove border attribute from HTML settings table
Merge branch 'wip-MDL-36968-int' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)

Reported by Mark Neilsen.
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
MDL-37458 testing lock externalization
MDL-37546 Assignment fix assign_get_recent_mod_activity code cleanup regression.