Re-factored checkpoint directory detection with --recover
(refs #3440)
Merge pull request #3465 from aeslaughter/refactor-3440

Re-factored checkpoint directory detection with --recover
Merge commit '57e6ac7a4e80f6c24a7aad2c3be2b40dcbc7e8a1'