Merge proposals dependent on lp:~ericsnowcurrently/fake-juju/makefile-tweaks

lp:~ericsnowcurrently/fake-juju/makefile-tweaks has no merge proposals.