[Bug 1891673] Fix merged to neutron (stable/queens)

Reviewed: https://review.opendev.org/c/openstack/neutron/+/810397 Committed: https://opendev.org/openstack/neutron/commit/b950fff6700bdfaacbf64415b322525ddcab85ef Submitter: "Zuul (22348)" Branch:stable/queens commit b950fff6700bdfaacbf64415b322525ddcab85ef Author: Rodolfo Alonso Hernandez

[Bug 1891673] Fix merged to neutron (stable/queens)

Reviewed: https://review.opendev.org/750402 Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=f63e3595c4e2aede7168fb1e65dbe7190308adce Submitter: Zuul Branch:stable/queens commit f63e3595c4e2aede7168fb1e65dbe7190308adce Author: Edward Hope-Morley Date: Fri Aug 14 17:4