Merge "VNF characterization scale_up test, untested"