Merge proposals dependent on lp://staging/~thomas-voss/trust-store/fix-1518883

lp://staging/~thomas-voss/trust-store/fix-1518883 has no merge proposals.