Fix proposed in master: https://review.openstack.org/621673
NOTE: We should backport https://review.openstack.org/619392 as well.
Fix proposed in master: https:/ /review. openstack. org/621673
NOTE: We should backport https:/ /review. openstack. org/619392 as well.