MDL-39813 dewordified the login screen
MDL-39088 fix admin/localplugins.php uninstall url
MDL-39558 badges: Add backup/restore to course badges
MDL-39558 badges: Add backup/restore of manually awarded badges
MDL-39558 badges: Prevent backup of badges without user information
MDL-39813 added some white space above the cookie message
Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle
MDL-39813 recompile less for bootstrapbase
MDL-39986 badges: Show badge navigation to users with awardbadge capability

Also fixes an arror when a user with this capability tries to award a badge,
but their role is not among the criteria set up for a badge
MDL-39088 fix incorrect module count SQL
Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle
Merge branch 'moduleuninstallfix' of https://github.com/skodak/moodle
MDL-40376 Fix copy/paste typo
MDL-39813 behat: fixed up behat expectations
MDL-40039 phpunit: Test core_files_external::upload() without the new params
MDL-40308: Fix javascript for lti mod_form

It was toggling the state of the hidden input - not the checkbox.
MDL-40131 theme_bootstrapbase: added missing grader table css to less/moodle/grade.less

Conflicts:

	theme/bootstrapbase/style/moodle.css
MDL-40401 Libraries: load_temp_role() and remove_temp_roles() can not be used any more.
Merge branch 'wip-mdl-40401' of git://github.com/rajeshtaneja/moodle into MDL-40402-master