Fix tests
Merge branch 'master' of github.com:dotcloud/openstack-docker