Git commits in Moodle 3.11.4 by Peter Dias

commit 48e1f7f484f68af93d088ada4631aef6b3873797
Author: Peter Dias <peter@moodle.com>
Date:   Tue, 24 Aug 2021 12:33:52 +0800
Tag:    v3.11.4

MDL-70946 repository: Reenable and fix the disabled behat test