Retry fixes and some OpenStack Grizzly fixes