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

Knife cloud plugins bootstrap problem with Chef 12 when using custom templates.
Merge pull request #2377 from opscode/sersut/12-port-knife-ec2

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