Syncing Havana code into Grizzly branch
Merge branch 'n1k-grizzly' of https://github.com/CiscoSystems/neutron into n1k-grizzly

Conflicts:
	quantum/plugins/cisco/db/n1kv_db_v2.py
	quantum/plugins/cisco/n1kv/n1kv_client.py
	quantum/plugins/cisco/n1kv/n1kv_quantum_plugin.py