Merge "Prox L2FWD multiflow test fix"