Merge "Allow --profile to be used in phpunit.php"