Merge "clat: enable PACKET_VNET_HDR on v6 ingress"