Merge "Harden TLS fingerprint test against flakiness"