Merge branch 'MDL-62884-master' of git://github.com/damyon/moodle

diff --cc admin/tool/dataprivacy/classes/output/data_requests_table.php
Simple merge

diff --cc lib/outputcomponents.php
Simple merge

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

diff --cc theme/bootstrapbase/less/moodle/core.less
Simple merge

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