Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-78383' of https://github.com/jrchamp/moodle

cache/classes/config.php

@@ -65,12 +65,6 @@ class cache_config {
      */
     protected $configdefinitionmappings = array();
 
-    /**
-     * The locking mappings that have been configured.
-     * @var array
-     */
-    protected $configlockmappings = [];
-
     /**
      * An array of configured cache lock instances.
      * @var array
@@ -149,7 +143,6 @@ class cache_config {
         $this->configlocks = array();
         $this->configmodemappings = array();
         $this->configdefinitionmappings = array();
-        $this->configlockmappings = array();
 
         $siteidentifier = 'unknown';
         if (array_key_exists('siteidentifier', $configuration)) {