Merge pull request #16644 from dhiltgen/discovery_tls

Add TLS support for discovery backend