openstack compatibility
fix cloud
Merge branch 'develop'