MDL-38065 gradebook: Fix issue with hidden categories breaking rowspan.

Hidden subcategories break the rowspan in the gradebook; this fix corrects
the calculation of the rowspan.
MDL-38172 Lesson: Additional Info not displayed at end of lesson
MDL-47754 install: fix redirect loop

Conflicts:
	user/editadvanced.php
Merge branch 'MDL-38065-fix-26' of git://github.com/jmarthaler/moodle into MOODLE_26_STABLE
Merge branch 'wip_MDL-47754_m26_installredir' of git://github.com/skodak/moodle into MOODLE_26_STABLE
MDL-47666 DB auth & enrol: unit tests fail with custom DB drivers

Changed to used $DB->get_db_family, rather than hard-coding the list of
class names.
MDL-47673 quiz generator: default grade 100 & fix review options

The review option defaults need to be like what you get from the editing
form, no what is stored in the database, or they don't work!
MDL-47711 behat: make it easier to copy the init.php command.
Merge branch 'MDL-47673_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
Merge branch 'MDL-47711_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
Merge branch 'MDL-47666_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
Merge branch 'MDL-38172_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE