refs #7789 Bringing ticket up to date with current master state

Merge branch 'master' into feature/7789_fitpeak_to_findpeaks_new

Conflicts:
	Code/Mantid/Framework/Algorithms/src/FindPeaks.cpp
refs #7789 renamed file
refs #7789 Conflicts with develop

Merge branch 'feature/7789_fitpeak_to_findpeaks_new' into develop

Conflicts:
	.gitattributes
	Code/Mantid/Framework/Algorithms/src/FindPeaks.cpp