Merge proposals dependent on lp://staging/~smoser/cloud-init/trunk.mcollective-cleanup

lp://staging/~smoser/cloud-init/trunk.mcollective-cleanup has no merge proposals.