Merge branch 'MDL-42239-master' of git://github.com/ankitagarwal/moodle
MDL-31405 Assignment: removed type in time shift reset status

Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
MDL-42117 JavaScript: Don't rely on node data for course toolboxes

The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.

Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.

This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
MDL-42117 JavaScript: Ensure that new activities are fully set up

We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
MDL-26170 RSS: fixed RSS cache clearing when items are deleted
MDL-42459 Atto: Bye bye - see you in the plugins db!
MDL-42464 mod_chat: Correct use of encoded & in link
Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle
Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle
Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle
Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle
Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle

Conflicts:
	version.php
MDL-42459 upgrade: fix upgrade step ordering

Also incremented version to be safe
Merge branch '40976-26' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle

Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-42112-master' of git://github.com/damyon/moodle
Merge branch 'w43_MDL-42440_m26_authenable' of https://github.com/skodak/moodle
MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully