MDL-40121 Support old activities with subtypes
MDL-40121 Added format_singleactivity in standard package
Revert "MDL-35131 Caching: Purge all will clear course modinfo cache - Thanks to Thomas for patch"

This reverts commit 6ab62db65ca1719acdbf13d74756d20dbd987d1b.

This is breaking upgrades from 22 - purgeallcaches gets called during upgrade but
rebuild_course_caches is not a safe api to use in this case.
Merge branch 'wip-MDL-38747-master' of https://github.com/satrun77/moodle
Merge branch 'MDL-40412' of git://github.com/merrill-oakland/moodle
Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle
Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges

Conflicts:
	lib/db/upgrade.php
	version.php
MDL-40555 cache: implemented unit tests for default search functionality
MDL-40680 store_memcached: fix serialiser options

* Use correct lang string for SERIALIZER_IGBINARY
* Use PARAM_INT for the parameter
MDL-35851 Lesson module: fix page order id for import questions. Add upgrade script to fix lesson pages corrupted links
Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle
Merge branch 'MDL-40538' of https://github.com/mr-russ/moodle
Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-40524' of git://github.com/aolley/moodle
Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle
Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle
Merge branch 'MDL-39812_bootstrapbase' of git://github.com/rwijaya/moodle
MDL-39812 recompile less for bootstrapbase
Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-40195' of git://github.com/aolley/moodle