Merge proposals dependent on lp://staging/~clint-fewbar/pyjuju/add-testrunner

lp://staging/~clint-fewbar/pyjuju/add-testrunner has no merge proposals.