Merge "To update vsperf/packet-forwarding configuration files" into stable/euphrates