Merge "Dedupe trust anchors"