Merge proposals dependent on lp://staging/~oddbloke/cloud-init/replace-mocker

lp://staging/~oddbloke/cloud-init/replace-mocker has no merge proposals.