Put back output file prefixes.  Refs #6861.
Merge branch 'feature/6861_putback_output' into develop