Merge branch 'MDL-59039-master' of https://github.com/sammarshallou/moodle

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

diff --cc search/classes/base.php
Simple merge

diff --cc search/classes/manager.php
Simple merge

diff --cc search/tests/manager_test.php
Simple merge