Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev