Use hashed fingerprint instead of probe_asn for correlating bridge reachability with tcp connects

Also resolve the conflicts of bug 13640 and 13644.