Merge "Use separate OVS and OVN directories"