Refs #8739 Update system tests to match.
Refs #8739 Update test workspace names to reflect changes.
Merge branch 'feature/8739_temp_param_in_convfit' into develop