Merge "Fix RESTCONF Flow test case"