Refs #10383 fixing some cpp check warnings