Rebase integration tests

Orig PR - https://github.com/opscode/knife-cloud/pull/58