Retry connecting to neutron correctly

- Check for the right string in the error message
- Retry more times (up to a minute's waiting) in case it's still starting
Merge branch 'bugfix/retry-neutron-connections' into stable/havana