MDL-45893 user_menu: fix to hide user_pictures from screen readers
Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
MDL-46171 dml: DML unit test for tricky SQL in assign upgrade

This tests a workaround for set_field_select where the set table and from table are the same.
Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle
MDL-47474 Calendar export: Fix user id in authorization check
MDL-42993 auth: spaces removed from usernames by default only

Functionality by default does not change with this patch.
However spaces are no longer stripped when cleaning usernames IF
$CFG->extendedusernamechars has been set.

Also included 2 trim statements where small issues were found with reading
external usernames in that  were not filtered for trailing whitespaces.
Merge branch 'MDL-46282-master' of git://github.com/andrewnicols/moodle

Conflicts:
	version.php
MDL-47303 libraries: import latest jQuery library and friends
MDL-47477 libraries: use smoothness theme for jquery ui
Merge branch '47428-28' of git://github.com/samhemelryk/moodle
MDL-47404 filelib: Prevent flash from treating files as uploads
added to send_stored_file as well.
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
MDL-37707 mod_assign: Prevent user from changing grouping in team submissions
MDL-47484 atto_indent: Prevent loss of rangy markers in some cases
MDL-47214 core: IPs should be cleaned
Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle
Revert "MDL-45893 user_menu: revised based on action_menu"

Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
MDL-47298 libraries: Update password_compat to latest version
MDL-46295 course: add search box to all course listings, manage button when appropriate