Merge branch 'MDL-67883-squash' of https://github.com/Chocolate-lightning/moodle

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

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

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

diff --cc theme/boost/scss/moodle/core.scss
Simple merge

diff --cc theme/boost/style/moodle.css
Simple merge

diff --cc theme/classic/style/moodle.css
Simple merge