MDL-47054 theme: fixed issue with the user rtl table
MDL-47080 theme: call format_string on site shortname
Merge branch 'm26_MDL-47054' of git://github.com/totara/moodle into MOODLE_26_STABLE
MDL-46834 filepicker: dnd upload should respect the current context id
MDL-46834 dndupload: Hide dnd message when user cant upload files
MDL-47076 badges: Add checks to user fields during badges restoration

Change-Id: Ib429092fa5c125d1bf57f886036b7c6617f1ec6f
MDL-46997 Grades: Improve the behat tests for grade aggregation

The tests now cover hidden grades in sub categories for all aggregation types. This change
includes a data generator for grade categories, with unit tests and behat tests for
the generator.

Conflicts:
	admin/tool/behat/tests/behat/data_generators.feature
	grade/tests/behat/grade_aggregation.feature
	lib/tests/behat/behat_data_generators.php

Conflicts:
	lib/tests/behat/behat_data_generators.php
MDL-46997 Grades: Fix aggregation when hiding is excluded and items have nested dependencies

Includes a unit test for the dependency flattening function.
MDL-46997 Grades: fix sum of grades with hidden items with differing maxgrades
Merge branch 'wip-MDL-46834-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
Merge branch 'wip-MDL-47080-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
Merge branch 'm26_MDL-47076' of git://github.com/totara/moodle into MOODLE_26_STABLE
Merge branch 'MDL-46997-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE