Merge "Fix syntax error in in test_vnfs from systest" into v6.0