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

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