Merge "Several bug fixes in ODL-SFC functest testcase"