Merge smarter certificate selection for pre-TLS-1.2 clients