Fix errors from a bad rebase

Refs #9842