Merge proposals dependent on lp:~bcsaller/pyjuju/makefile-meta

lp:~bcsaller/pyjuju/makefile-meta has no merge proposals.