Working around bugs in cloud-init
Merge pull request #217 from brenton/enterprise-2.0

Working around bugs in cloud-init