State dump retry loop for #926.
Merge pull request #944 from hjoliver/960.state-dump-retry

State dump retry loop for #926.