Merge "Modify Xtesting code according to NFV-TST version"