Merge "Handle phpunit being autoloaded from checkLess.php"