The waypoint id must be kept when merging data

If we want to keep the id stable, then it must be copied over.
Part of fix for #2430.