finish challange 10

just some simple bug fixes.
and patches to rackspace-openstack submitted upstream