Merge branch 'MDL-45184-master' of git://github.com/junpataleta/moodle

diff --cc lang/en/cache.php
Simple merge

diff --cc lang/en/deprecated.txt
index 0164c28,e8608e7..1bb420f
--- 1/lang/en/deprecated.txt
--- 2/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@@ -141,4 -141,5 +141,6 @@@ europe/belfast,core_timezone
  pacific/ponape,core_timezones
  pacific/truk,core_timezones
  pacific/yap,core_timezones
- editsettings,core_badges
++editsettings,core_badges
+ availablelicenses,core_admin
+ managelicenses,core_admin

diff --cc lib/db/caches.php
index ac2fa19,9cfc72d..14dca04
--- 1/lib/db/caches.php
--- 2/lib/db/caches.php
+++ b/lib/db/caches.php
@@@ -455,11 -455,10 +455,18 @@@ $definitions = array
          'simpledata' => true,
      ],
  
 +    // Cache the grade letters for faster retrival.
 +    'grade_letters' => [
 +        'mode'                   => cache_store::MODE_REQUEST,
 +        'simplekeys'             => true,
 +        'staticacceleration'     => true,
 +        'staticaccelerationsize' => 100
 +    ],
++
+     // Cache for licenses.
+     'license' => [
+         'mode' => cache_store::MODE_APPLICATION,
+         'simplekeys' => false,
+         'simpledata' => false
+     ],
  );