Refs #10507. fixing more clang warnings