Performance testcases.
passing the flavor while launching the VM and corrected the script error
Resolve automatice merge confilicts.
Merge branch 'stnaik_netperf_test_cases_master'