Refs #7838 Make the output options in C2E consistent.
Merge branch 'feature/7838_c2e_output_options' into develop