Merge proposals dependent on lp:~jtv/maas-test/pidfiles-run

lp:~jtv/maas-test/pidfiles-run has no merge proposals.