Backport: Better documentation and a bugfix for cloud-init