Fixed unit tests that failed after merge
Merge branch 'knife-cloud-issues' of https://github.com/ClogenyTechnologies/knife-openstack into knife-cloud-issues