[CentOS-devel] Backport cloud-init upstream bug fix