Changes to resolve merge issues
Added reference to windows_bootstrap_context for sshBootstrapProtocol
Merge pull request #41 from opscode/adamed-oc-9596

OC-9596: Succesfully run the integration tests on jenkins for knife-openstack(based on knife-cloud)