Merge proposals dependent on lp://staging/~marcoceppi/charmrunner/graph-build-fix

lp://staging/~marcoceppi/charmrunner/graph-build-fix has no merge proposals.