bump(coreos-base/coreos-cloudinit): Bugfixes for cloudinit
Merge pull request #637 from marineam/backport

Backport cloudinit to 324