Merge proposals dependent on lp:~jml/testtools/build-scripts

lp:~jml/testtools/build-scripts has no merge proposals.