Fixed some merge issue.  Refs #8405.