Refs #8015 Swapped "Amplitude" parameter for "Height"
Merge remote-tracking branch 'origin/feature/8015_convfit_parameter_error'