fixing cloud init problem
Merge branch 'develop' of github.com:Spantree/puppet-bootstrap into develop