Add a field to OptOut annotation called "specific" to allow opting out of parameterized tests.
Merge remote-tracking branch 'origin/master'