mark KNIFE-310 for next release, same fix as KNIFE-309
check for empty server.image, indicating a boot from volume instead of an image
Merge branch 'master' of http://github.com/opscode/knife-openstack into epic-knife-cloud-refactor-master

Conflicts:
	CHANGELOG.md
	lib/chef/knife/openstack_server_list.rb