Resolve "Replace output_options by output-options"

Merged Razvan Becheriu requested to merge 3004-replace-output_options-by-output-options into master

Merge request reports