Resolved conflict. Refs #8291.