Merge "Add the IPv6 IP to the TLS cert"