Comment 9 for bug 1718512

I got a recreate based on comment 7, so https://review.openstack.org/#/c/505771/ has been updated to be the functional regression recreate test, and a follow up patch with the fix will go on top.