Merge request with fix and tests at https://code.launchpad.net/~paelzer/cloud-init/+git/cloud-init/+merge/304064
Merge request with fix and tests at https:/ /code.launchpad .net/~paelzer/ cloud-init/ +git/cloud- init/+merge/ 304064