Merge "Fix netvirtsfc flows"