OC-10172 Knife ec2 ignores -x option for ssh bootstrap, but honors it for winrm protocol

PBI link: https://tickets.corp.opscode.com/browse/OC-10172
@adamedx please review and accept changes.
Thanks!!!