Merge branch 'MDL-52346' of git://github.com/mr-russ/moodle

diff --cc cache/classes/definition.php
Simple merge

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

diff --cc lib/db/caches.php
Simple merge