Merge remote-tracking branch 'origin/bugfix/10040_wsInADS'
Merge remote-tracking branch 'origin/bugfix/7570_spline_smooting_error'
Fix broken TofConverter gui.

Refs #10162.
Merge branch 'bugfix/10162_tofconverter_gui_is_broken' into develop