remove duplicated method from merge
Merge branch 'integrate-chef-10-18-0'
Add -A option to knife ssh and knife bootstrap
Add test for bootstrap setting the forward-agent option