Merge branch 'stable/grizzly' of https://github.com/openstack/nova into grizzly/stable

Conflicts:
	nova/tests/network/test_quantumv2.py