Will commit fix when https://review.openstack.org/#change,682 is reviewed and merged to avoid conflicts
Will commit fix when https:/ /review. openstack. org/#change, 682 is reviewed and merged to avoid conflicts