Merge branch 'master', remote-tracking branch 'origin' into feature/8585_EISF_output_from_fitting
Refs #8585 Remove default width options from interface
Refs #8585 Add extra check to prevent plotting.

Also remove warning due to integer casting.
Merge branch 'feature/8585_EISF_output_from_fitting' into develop