F18 cloud-init proposed rebase update