Merge proposals dependent on lp://staging/~sinzui/juju-ci-tools/delete-old-canonistack-machines

1. delete-old-canonistack-machines
2. Dependent merge proposals