Merge "Use IPv6 hop limit from upstream interface."