Fixed progress reporting.  Refs #8405.
Resolved the conflict. Refs #8405.