Merge "Add known failures for new tests that are too fragile" into oc-dev