Changed task parameters for retry to be more consistent with previous settings. Cleaned up logging in submission save.
Merge branch 'master' into production