Comment 27 for bug 1679750

Well, we backported it to stable/queens and it's marked for pike as well, so I'm not sure I intended on backporting it to pike and just forgot, or if there was a good reason to avoid backporting it to pike - note it's not just a single change though and there is another related bug fix tied up in this series:

https://review.openstack.org/#/q/topic:bug/1756179+branch:stable/queens