Refs #8015 Swapped "Amplitude" parameter for "Height"
Merge branch 'feature/8015_convfit_parameter_error' into develop