Comment 4 for bug 1695634

I pushed up a revert of the nova patch:

https://review.openstack.org/#/c/470635/

and then a test commit in shade that depends on it

https://review.openstack.org/#/c/470636/

the test commit passes tests.

What should we do about this? It seems that maybe we need $something at the devstack level that can say "hey, I need to wait for the cloud to be consistent with itself or something before I run these tests"