Merge "Patch error in which --retry filters parameterized tests" into oc-dev