Merge branch 'ameya-metadata-option' of https://github.com/opscode/kn…

…ife-openstack into ameya-metadata-option

Conflicts:
	lib/chef/knife/cloud/openstack_server_create_options.rb
	lib/chef/knife/openstack_server_create.rb
	spec/unit/openstack_server_create_spec.rb