refs #6856 Minor commits, and digging for merge conflict source