Merge proposals dependent on lp:~cjwatson/trust-store/tests-dep

lp:~cjwatson/trust-store/tests-dep has no merge proposals.