MDL-39189 badges: Allow users with multiple roles choose their role when awarding a badge
MDL-39209 badges: Fix course badges page access and navigation when course badges are disabled
MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php
MDL-39526 cache: purged when upgrade finished
MDL-39573 theme: bootstrap - always show pre and post regions when editing
Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges
Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges
MDL-39642 Merge English strings from the en_fix language pack
Merge branch 'MDL-39604-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle

Conflicts:
	lang/en/badges.php
on demand release 2.5rc1+
Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39599-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39573-master' of git://github.com/damyon/moodle
MDL-39601 user: Missing setType in user filters