Merge "Allow PHPUnit 6 optionally in require-dev"