bump(coreos-base/coreos-cloudinit): Workaround config source conflict

https://github.com/coreos/coreos-cloudinit/pull/87
https://github.com/coreos/coreos-cloudinit/issues/86
Merge pull request #562 from marineam/hack

bump(coreos-base/coreos-cloudinit): Workaround config source conflict