Git commits in Moodle 3.3.7 by Mark Johnson

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

MDL-62408 behat: Correct PHPUNIT_TEST checks in behat_config_util