Merge "VNFs: Correcting the fdir mode for SWLB and HWLB"