Resolved the conflict during rebase. Refs #8291.