Unify normal and pre-* action state dumps

This ensures that the pre-* action state dumps are rolled the same way
as the normal state dumps.
Do not generate pre-* action state dumps
Merge pull request #888 from matthewrmshin/unify-state-dump

Unify normal and pre-* action state dumps