Merge "Adding vfw scale-up test with ixia as tg"