Git merges in Moodle 3.5.17 by Sara Arjona

commit cf6c8a5acd9a055c29104f7ea0996da6c722a68f
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 05 Mar 2021 23:01:43 +0800
Tag:    v3.5.17

Merge branch 'install_35_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_35_STABLE


commit 61bc167f534722f6f2fb38a63a3ce5bf0dd355b9
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 01 Mar 2021 23:20:56 +0800
Tag:    v3.5.17

Merge branch 'MDL-68735_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE