Merge "Try to avoid bogus JobTest failures for PHP 7"