workspace name underscores are no longer converted

I found that the caption settign method was converting hyphens to underscores as well as the QString::replace that was already in there.

There was a comment note that underscores may cause problems for the legendwidget, so that may need looking at

Refs #8031
Merge branch 'feature/8031_workspace_in_sample_log_name' into develop