Merge "Make BatchRowUpdateTest compatible with PHPUnit 6"