Merge proposals dependent on lp:~tvansteenburgh/charm-tools/update-test-templates

lp:~tvansteenburgh/charm-tools/update-test-templates has no merge proposals.