Merge "Add support for IPv6 tunnel endpoints"