Merge "Bug fix in functest ODL-SFC"