Merge pull request #3210 from permcody/restartable_fix

Attempting to re-enable the kernel restart tests - closes #2266
Updating example 21 - closes #3225