Backport latest cloudinit to 324