Merged in upstream: https://github.com/canonical/cloud-init/commit/b1ef6cfd0af8f5296623efe56d47b84928a609b1
Merged in upstream: https:/ /github. com/canonical/ cloud-init/ commit/ b1ef6cfd0af8f52 96623efe56d47b8 4928a609b1