Checkpointing work.  Refs #6968.
Resolved conflict.  Refs #6968.