Added a check to find out occasional OSX error. Refs #7789.
Merge branch 'feature/7789_fitpeak_to_findpeaks_new' into develop