Merge "raise PHPUnit default timeouts"