State dump retry loop for #926.
Fix reloaded retrying tasks.
Added test for reloaded retrying tasks.
Simplified some test suite scripting.
Merge pull request #944 from hjoliver/960.state-dump-retry

State dump retry loop for #926.
Merge pull request #946 from hjoliver/945.reload-retrying-tasks

Fix reloaded retrying tasks.