Merge "Fix errors in designate scenarios jobs"