Unmarked pending integration tests
Unmarked pending integration tests

Conflicts:

	spec/integration/openstack_spec.rb

chef/knife-openstack,BobbyRyterski/knife-openstack,david-crowder/knife-openstack,chef/knife-openstack