Resync stack. from openstack-dev