Sync modules/openstack

Sync modules/openstack to upstream
fb9a7091d30d614fe5b93f4294f73b1e2cb48344 (includes heat support)