Git commits in Moodle 3.5.1 by Mark Johnson

commit 81fb99ed66a9eceeb5889afb7876206693108640
Author: Mark Johnson <mark.johnson@open.ac.uk>
Date:   Thu, 17 May 2018 19:10:48 +0800
Tag:    v3.5.1

MDL-62488 filebrowser: Stop unit tests assuming number of categories

commit dc7c48a9d7b52e5a97585093229d2e21852cefbd
Author: Mark Johnson <mark.johnson@open.ac.uk>
Date:   Fri, 11 May 2018 22:32:32 +0800
Tag:    v3.5.1

MDL-62408 behat: Correct PHPUNIT_TEST checks in behat_config_util