Sync with openstack-dev:master