Avoid races with Neutron by waiting for it.

We're seeing this both locally and in CI, probably load related.

Change-Id: I66d8a9173514c0dbc6524258616fdd7b63210b21
Merge "Avoid races with Neutron by waiting for it."