Fix restart.
Merge remote branch 'upstream/master' into fix.restart-pre-init
Merge remote branch 'upstream/master' into fix.restart-pre-init
Update existing restart tests for new behaviour. Add test for pre-init cycling and restarts.
Merge pull request #744 from arjclark/fix.restart-pre-init

Fix pre-initial cycle dependencies ignorance post restart