Git commits in Moodle 3.4.4 by Mark Johnson

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

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

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

MDL-62408 behat: Correct PHPUNIT_TEST checks in behat_config_util