Fix states and correct tidy task.
Use quoted inputs. Fix ping call using None.
Remove commented out line.
Merge remote branch 'upstream/master' into tweak.restart-test
Remove flakey status dump comparison.
Remove unnecessary file copying.
Merge pull request #742 from arjclark/tweak.restart-test

fix restart-test