Merge remote-tracking branch 'origin/feature/8762_sphinx_timebox'
Refs #8798 Change ConvFit to output fit parameters in correct format.

This change will only be noticeable when uisng two Lorentzians.
Merge branch 'bugfix/8798_convfit_fit_output' into develop