Change https://review.openstack.org/305611 needs to cherrypicked and might have some conflicts which need to be resolved in order to be merged in master.
Change https:/ /review. openstack. org/305611 needs to cherrypicked and might have some conflicts which need to be resolved in order to be merged in master.