MDL-40571 work around block editing hacks on admin page
MDL-40611 fix context cache size expectation
MDL-40621 fixed small bug in function editor_tinymce_plugin::fix_row()
MDL-40652 Calendar: Changed pagelayout from 'standard' to 'base' in calendar/export.php.
MDL-39062 cache: persist keys now set properly
MDL-39062 cache: version bump to update definitions
Automatically generated installer lang files
MDL-40260 block_course_overview: prevent MNET courses from being dimmed
Merge branch 'wip-MDL-39062-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40633_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
MDL-39563 Fixing mobilecssurl is not being returned in WebService, phpunit tests

Conflicts:

	webservice/externallib.php
MDL-39563: Change to use $CFG consistently
MDL-40585 backup: cache XML parent paths

For $this->groupedpaths, using a key is faster as there is
no need to do in_array searches.

Parent cache allows dirname calls to be substantially reduced.
2048 was chosen as a cache size as this class operates on chunks
of the restore at a time, 8k questions produces a parent cache of
about 500 paths and uses 300K of memory.  Scaling up to 2048 will
use about 1.2M of RAM for really large restores.  This is acceptable
for the 48% function call reduction and the 10% runtime improvement
seen.
MDL-39441 behat: Restrict config.php allowed settings
Merge branch 'wip-MDL-38747-MOODLE_25_STABLE' of https://github.com/satrun77/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40412_m25' of git://github.com/merrill-oakland/moodle into MOODLE_25_STABLE
MDL-40584 backup: Query db once per category in precheck

The cache is function local and testing against a large database
indicates 10k questions is a large category.  Restore already
uses MEMORY_EXTRA and that will have enough space for the couple
of megabtyes a local sql hash will introduce.
Merge branch 'w29_MDL-40571_m25_adminblocks' of https://github.com/skodak/moodle into MOODLE_25_STABLE
MDL-40555 cache: Static store is searchable
MDL-40555 cache: implemented unit tests for default search functionality