Merge proposals dependent on lp://staging/~andrewjbeach/juju-ci-tools/fix-wait-for-started

lp://staging/~andrewjbeach/juju-ci-tools/fix-wait-for-started has no merge proposals.