Merge proposals dependent on lp://staging/~sseman/juju-ci-tools/update-win-code

lp://staging/~sseman/juju-ci-tools/update-win-code has no merge proposals.