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

Conflicts:
	nova/virt/libvirt/vif.py

Change-Id: I76015564c104390aa1760e1c0ceb23c6cdc0889c