am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point"

* commit '158840079a501784c76e9816b215b3a1839074ef':
  464xlat: use a gatewayed route, not point-to-point