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