MDL-45507 theme_bootstrapbase: Fix regression for theme based custom menu

in renderers/core_renderer.php.
MDL-46036 mod_survey: added logic to prevent user trying to download when there are no results
MDL-46163 Question bank: Category selector renders as nested form
MDL-46107 badges: Fix badges navigation and remove empty breadcrumbs on pages using Clean

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
MDL-45961 Customise this page button on user profile page only works correctly for users own profile
MDL-46161 switch the field order of the index on mdl_files_reference to improve performance of file_storage::search_references
MDL-46063 feedback: Fix user pictures
MDL-46147 modinfo: performance improvement for course page

This is a big win in a specific situation, ie filters enabled for content+headings,
and no activity descriptions visible on the course page.
MDL-46147 modinfo: performance improvement for course page (check filterall)
Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle

Conflicts:
	lib/db/upgrade.php
	version.php
Merge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github.com/MorrisR2/moodle
Merge branch 'MDL-46107_master' of https://github.com/totara/openbadges
MDL-42071 caching Skip memcache(d) tests if no servers defined
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle
Merge branch 'MDL-46063_master' of git://github.com/schach/moodle
Merge branch 'MDL-45961' of https://github.com/NeillM/moodle
MDL-45961 user profile: track user on reset

It seems that redirect (after reset button) was also
missing the userid so the user track was lost.
Merge branch 'wip-MDL-45507_master' of git://github.com/lazydaisy/moodle
Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle