Merge proposals dependent on lp:~mew/charm-helpers/apt-test-fixes

lp:~mew/charm-helpers/apt-test-fixes has no merge proposals.