Changes to avoid NPE when ordinary peak fitting used.
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git