Merge proposals dependent on lp:~tvansteenburgh/charm-tools/lp-1357507

lp:~tvansteenburgh/charm-tools/lp-1357507 has no merge proposals.