Merge branch 'MDL-62899-search-icons-master' of https://github.com/dmitriim/moodle

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

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

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

diff --cc user/tests/search_test.php
Simple merge