Conflicts:
inc/python
NOTE(stephenfin): Conflicts are due to the absence of
I9232f3fae1598297e83c4ea37339896f7dcbd44f and
I3f7541e691717186b7c73f10ffabae6fc0c5c9f9, neither of which we want to
backport.
Also marked devstack-platform-debian-bullseye as non-voting
to unblock this patch.
Change-Id: I221a03b2f8314fee66672c23d7ece4eb900c038c
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit e20d092cba)
(cherry picked from commit 978a231b10)
8977a58ccc