Merge "Apply vlan_strip_offload config only when using vlan for fdio" into stable...