Updated openstack/openstack
Project: openstack/nova  9dceb089538db81dcadb250c54d4027e573f2ac2

Fix more re-definitions and enable F811/F813 in gate

Additional issues found by flake8 by enabling F811 and
F813. There was only one F813 list comprehension redefinition.
The rest of the changes were F811 redefinition of unused name
violations.

Change-Id: Iad5406c149ab21d360b7e98899a92082197c8c17