Merge "Fix OVN provider jobs"