Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-options