CLOUDIFY-2533 updated sanity to use new openstack plugin defs
Merge branch 'develop' of github.com:CloudifySource/cosmo-manager into develop