Put back output file prefixes.  Refs #6861.
Merge remote branch 'origin/feature/6861_putback_output'