Refs #8449 Replace throw with log error
Refs #8449 Resolving merge conflicts

Merge branch 'feature/8449_sassena_stamp_removal' into develop

Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp