Merge "OVN plugin configuration fixes"