Merge "Switch enforce-scope job to ovn"