r23613: pull in net idmap change from the 3.0.25 tree