Merge proposals dependent on lp://staging/~rogpeppe/juju-core/393-1.14-fix-live-test

lp://staging/~rogpeppe/juju-core/393-1.14-fix-live-test has no merge proposals.