refs #6856 minor warning ans suspicions for merge error